From d10b1ccc5fdad479be094d2a4c0d3aa3c178a24d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 25 Jan 2007 17:44:06 +0000
Subject: [PATCH] util.h isn't really needed and only causes problems when
 compiling the tests

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4896 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/7zip/LZMADecode.h | 7 ++++---
 Source/bzip2/bzlib.h     | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/7zip/LZMADecode.h b/Source/7zip/LZMADecode.h
index c2a3d4f9..fd87af70 100644
--- a/Source/7zip/LZMADecode.h
+++ b/Source/7zip/LZMADecode.h
@@ -23,14 +23,15 @@
  ***********************/
 
 #include "../Platform.h"
-#include "../exehead/util.h"
 
 /* #define _LZMA_PROB32 */
 /* It can increase speed on some 32-bit CPUs, 
    but memory usage will be doubled in that case */
 
-#define lzmaalloc(bytes) GlobalAlloc(GPTR,bytes)
-#define lzmafree GlobalFree
+#ifdef _WIN32
+#  define lzmaalloc(bytes) GlobalAlloc(GPTR,bytes)
+#  define lzmafree GlobalFree
+#endif
 
 /***********************
  *  Configuration End  *
diff --git a/Source/bzip2/bzlib.h b/Source/bzip2/bzlib.h
index 0270f33b..c5a5c379 100644
--- a/Source/bzip2/bzlib.h
+++ b/Source/bzip2/bzlib.h
@@ -257,8 +257,6 @@ extern void BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
 
 #else//EXEHEAD
 
-#include "../exehead/util.h"
-
 /*-- states for decompression. --*/
 
 #define BZ_X_IDLE        1