Repair some damage caused by -Wundef allowance.

author: Mark Adler <madler@alumni.caltech.edu> 2012-03-14 09:18:15 -0700
committer: Mark Adler <madler@alumni.caltech.edu> 2012-03-14 09:18:15 -0700
commit: b18595d4c6925e97ec2c0a9e49230c189ce8fe64 (patch)
tree: 9f06cbf81d2236c93b801cf7439f249dabed2a0b
parent: cb1c1a363e885670f5030b71f2c858cd0c286327 (diff)
download: zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.tar.gz
zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.tar.bz2
zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.zip
3 files changed, 15 insertions, 15 deletions
diff --git a/zconf.h b/zconf.h
index 0154955..5338de6 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 af4e92e..c08d177 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 0154955..5338de6 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
author	Mark Adler <madler@alumni.caltech.edu>	2012-03-14 09:18:15 -0700
committer	Mark Adler <madler@alumni.caltech.edu>	2012-03-14 09:18:15 -0700
commit	b18595d4c6925e97ec2c0a9e49230c189ce8fe64 (patch)
tree	9f06cbf81d2236c93b801cf7439f249dabed2a0b
parent	cb1c1a363e885670f5030b71f2c858cd0c286327 (diff)
download	zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.tar.gz zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.tar.bz2 zlib-b18595d4c6925e97ec2c0a9e49230c189ce8fe64.zip

diff --git a/zconf.h b/zconf.h index 0154955..5338de6 100644 --- a/zconf.h +++ b/zconf.h
@@ -399,17 +399,17 @@ typedef uLong FAR uLongf;
399	# endif	399	# endif
400	#endif	400	#endif
401		401
402	/* accommodate both "#define _LARGEFILE64_SOURCE" and	402	/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
403	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even	403	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
404	* though the former does not conform to the LFS document), but consider	404	* though the former does not conform to the LFS document), but considering
405	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as	405	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
406	* equivalently requesting no 64-bit operations	406	* equivalently requesting no 64-bit operations
407	*/	407	*/
408	#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0	408	#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
409	# undef _LARGEFILE64_SOURCE	409	# undef _LARGEFILE64_SOURCE
410	#endif	410	#endif
411		411
412	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1	412	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
413	# define Z_LFS64	413	# define Z_LFS64
414	#endif	414	#endif
415		415
@@ -417,7 +417,7 @@ typedef uLong FAR uLongf;
417	# define Z_LARGE64	417	# define Z_LARGE64
418	#endif	418	#endif
419		419
420	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)	420	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
421	# define Z_WANT64	421	# define Z_WANT64
422	#endif	422	#endif
423		423


diff --git a/zconf.h.cmakein b/zconf.h.cmakein index af4e92e..c08d177 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein
@@ -401,17 +401,17 @@ typedef uLong FAR uLongf;
401	# endif	401	# endif
402	#endif	402	#endif
403		403
404	/* accommodate both "#define _LARGEFILE64_SOURCE" and	404	/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
405	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even	405	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
406	* though the former does not conform to the LFS document), but consider	406	* though the former does not conform to the LFS document), but considering
407	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as	407	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
408	* equivalently requesting no 64-bit operations	408	* equivalently requesting no 64-bit operations
409	*/	409	*/
410	#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0	410	#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
411	# undef _LARGEFILE64_SOURCE	411	# undef _LARGEFILE64_SOURCE
412	#endif	412	#endif
413		413
414	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1	414	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
415	# define Z_LFS64	415	# define Z_LFS64
416	#endif	416	#endif
417		417
@@ -419,7 +419,7 @@ typedef uLong FAR uLongf;
419	# define Z_LARGE64	419	# define Z_LARGE64
420	#endif	420	#endif
421		421
422	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)	422	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
423	# define Z_WANT64	423	# define Z_WANT64
424	#endif	424	#endif
425		425


diff --git a/zconf.h.in b/zconf.h.in index 0154955..5338de6 100644 --- a/zconf.h.in +++ b/zconf.h.in
@@ -399,17 +399,17 @@ typedef uLong FAR uLongf;
399	# endif	399	# endif
400	#endif	400	#endif
401		401
402	/* accommodate both "#define _LARGEFILE64_SOURCE" and	402	/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
403	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even	403	* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
404	* though the former does not conform to the LFS document), but consider	404	* though the former does not conform to the LFS document), but considering
405	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as	405	* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
406	* equivalently requesting no 64-bit operations	406	* equivalently requesting no 64-bit operations
407	*/	407	*/
408	#if defined(LARGEFILE64_SOURCE) && _LARGEFILE64_SOURCE == 0	408	#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
409	# undef _LARGEFILE64_SOURCE	409	# undef _LARGEFILE64_SOURCE
410	#endif	410	#endif
411		411
412	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE == 1	412	#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
413	# define Z_LFS64	413	# define Z_LFS64
414	#endif	414	#endif
415		415
@@ -417,7 +417,7 @@ typedef uLong FAR uLongf;
417	# define Z_LARGE64	417	# define Z_LARGE64
418	#endif	418	#endif
419		419
420	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(Z_LFS64)	420	#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
421	# define Z_WANT64	421	# define Z_WANT64
422	#endif	422	#endif
423		423