summaryrefslogtreecommitdiff
path: root/zlib-ng.h
diff options
context:
space:
mode:
authorHans Kristian Rosbach <hk-git@circlestorm.org>2018-09-17 12:22:43 +0200
committerHans Kristian Rosbach <hk-git@circlestorm.org>2018-09-17 12:22:43 +0200
commit584dd13b110c92da304d5d608dcdbfc0c8c9dfd0 (patch)
tree79d1212125e338bc122cc24420a76d20d87ed95f /zlib-ng.h
parent16b6cda67be0038327b416e5fa5c7243ed138e21 (diff)
Fix ZLIB_COMPAT=OFF and WITH_GZFILEOP=ON compilation failure.
Also add this combination to travis testing. Remove --native testing from travis, since they somehow make this fail very often, probably due to caching or running the executables on a different platform than the compiler thinks it is running on.
Diffstat (limited to 'zlib-ng.h')
-rw-r--r--zlib-ng.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/zlib-ng.h b/zlib-ng.h
index a2e59de..6010bba 100644
--- a/zlib-ng.h
+++ b/zlib-ng.h
@@ -1754,10 +1754,10 @@ ZEXTERN int ZEXPORT zng_gzgetc_(gzFile file); /* backward compatibility */
#endif
#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-# define gzopen gzopen64
-# define gzseek gzseek64
-# define gztell gztell64
-# define gzoffset gzoffset64
+# define zng_gzopen zng_gzopen64
+# define zng_gzseek zng_gzseek64
+# define zng_gztell zng_gztell64
+# define zng_gzoffset zng_gzoffset64
# ifndef Z_LARGE64
ZEXTERN gzFile ZEXPORT zng_gzopen64(const char *, const char *);
ZEXTERN z_off_t ZEXPORT zng_gzseek64(gzFile, z_off_t, int);