diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | gzread.c | 6 | ||||
| -rw-r--r-- | zlib.h | 15 |
4 files changed, 3 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 39fdce0..abcfcfe 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 8298f3d..8c92fda 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 @@ -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; @@ -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); |