From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Wed, 13 May 2015 09:48:54 +0000 (+0200)
Subject: Remove Z_PREFIX leftovers
X-Git-Tag: 1.9.9-b1~829
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8562a05920d303247a66c4d8addefdb2e86aa899;p=thirdparty%2Fzlib-ng.git

Remove Z_PREFIX leftovers
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39fdce0ec..abcfcfed4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ if(MSVC)
 endif()
 
 macro(generate_cmakein input output)
-    execute_process(COMMAND sed "/#define ZCONF_H/ a\\\n#cmakedefine Z_PREFIX\\n#cmakedefine Z_HAVE_UNISTD_H\n" -
+    execute_process(COMMAND sed "/#define ZCONF_H/ a\\\n#cmakedefine Z_HAVE_UNISTD_H\n" -
                     INPUT_FILE ${input}
                     OUTPUT_FILE ${output}
 )
diff --git a/Makefile.in b/Makefile.in
index 8298f3d7f..8c92fdadb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,7 @@ distclean: clean
 	@if [ -f zconf.h.in ]; then \
 	cp -p $(SRCDIR)/zconf.h.in zconf.h ; \
 	TEMPFILE=zconfh_$$ ; \
-	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
+	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
 	sed -f $$TEMPFILE $(SRCDIR)/zconf.h.in > zconf.h.cmakein &&\
 	touch -r $(SRCDIR)/zconf.h.in zconf.h.cmakein &&\
 	rm $$TEMPFILE ; fi
diff --git a/gzread.c b/gzread.c
index f92efdc0b..c61128acc 100644
--- a/gzread.c
+++ b/gzread.c
@@ -366,11 +366,7 @@ int ZEXPORT gzread(gzFile file, void *buf, unsigned len)
 }
 
 /* -- see zlib.h -- */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#else
-#  undef gzgetc
-#endif
+#undef gzgetc
 int ZEXPORT gzgetc(gzFile file)
 {
     int ret;
diff --git a/zlib.h b/zlib.h
index 465e6aeee..a42350ff4 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1664,14 +1664,8 @@ struct gzFile_s {
     z_off64_t pos;
 };
 ZEXTERN int ZEXPORT gzgetc_ (gzFile file);  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
 #  define gzgetc(g) \
           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
@@ -1689,21 +1683,12 @@ ZEXTERN int ZEXPORT gzgetc_ (gzFile file);  /* backward compatibility */
 #endif
 
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
 #    define gzopen gzopen64
 #    define gzseek gzseek64
 #    define gztell gztell64
 #    define gzoffset gzoffset64
 #    define adler32_combine adler32_combine64
 #    define crc32_combine crc32_combine64
-#  endif
 #  ifndef Z_LARGE64
      ZEXTERN gzFile ZEXPORT gzopen64 (const char *, const char *);
      ZEXTERN z_off_t ZEXPORT gzseek64 (gzFile, z_off_t, int);