From: Mark Adler <madler@alumni.caltech.edu>
Date: Wed, 14 Mar 2012 16:18:15 +0000 (-0700)
Subject: Repair some damage caused by -Wundef allowance.
X-Git-Tag: v1.2.7~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18595d4c6925e97ec2c0a9e49230c189ce8fe64;p=thirdparty%2Fzlib-ng.git

Repair some damage caused by -Wundef allowance.
---

diff --git a/zconf.h b/zconf.h
index 015495568..5338de6bc 100644
--- a/zconf.h
+++ b/zconf.h
@@ -399,17 +399,17 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
-/* accommodate both "#define _LARGEFILE64_SOURCE" and
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but consider
+ * though the former does not conform to the LFS document), but considering
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0
+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
 #  define Z_LFS64
 #endif
 
@@ -417,7 +417,7 @@ typedef uLong FAR uLongf;
 #  define Z_LARGE64
 #endif
 
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
 #  define Z_WANT64
 #endif
 
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index af4e92e6c..c08d1778a 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -401,17 +401,17 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
-/* accommodate both "#define _LARGEFILE64_SOURCE" and
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but consider
+ * though the former does not conform to the LFS document), but considering
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0
+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
 #  define Z_LFS64
 #endif
 
@@ -419,7 +419,7 @@ typedef uLong FAR uLongf;
 #  define Z_LARGE64
 #endif
 
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
 #  define Z_WANT64
 #endif
 
diff --git a/zconf.h.in b/zconf.h.in
index 015495568..5338de6bc 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -399,17 +399,17 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
-/* accommodate both "#define _LARGEFILE64_SOURCE" and
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but consider
+ * though the former does not conform to the LFS document), but considering
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0
+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
 #  define Z_LFS64
 #endif
 
@@ -417,7 +417,7 @@ typedef uLong FAR uLongf;
 #  define Z_LARGE64
 #endif
 
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
 #  define Z_WANT64
 #endif