aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/common/gzio_zutil.h
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-01-10 12:52:20 +0100
committerBjörn Gustavsson <[email protected]>2014-01-14 09:30:34 +0100
commit8a147a73651713efebb9ac973f618a6d66685eca (patch)
tree7c766bdaeec0957e4847a8762d1e47685ecc507e /erts/emulator/drivers/common/gzio_zutil.h
parent9205b6671892e7516e8571e4ecf19bfa2ade1130 (diff)
downloadotp-8a147a73651713efebb9ac973f618a6d66685eca.tar.gz
otp-8a147a73651713efebb9ac973f618a6d66685eca.tar.bz2
otp-8a147a73651713efebb9ac973f618a6d66685eca.zip
Don't make gzio.c dependent on the zutil.h header file
gzio.c is our own replacement for zlib's gzopen() etc (based on a version of gzio.c that was included in an old version of zlib). Unfortunately, gzio.c still depends on the *internal* zlib header file zutil.h which is not supposed to be used outside of the zlib source code. The dependencies are the use of the gzFile typedef and the F_OPEN() macro. Instead of gzFile, define and use our own ErtsGzFile. To get rid of the F_OPEN() macro, call open() of _wfopen() directly.
Diffstat (limited to 'erts/emulator/drivers/common/gzio_zutil.h')
-rw-r--r--erts/emulator/drivers/common/gzio_zutil.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/erts/emulator/drivers/common/gzio_zutil.h b/erts/emulator/drivers/common/gzio_zutil.h
index 00eccc80fc..854205cc2c 100644
--- a/erts/emulator/drivers/common/gzio_zutil.h
+++ b/erts/emulator/drivers/common/gzio_zutil.h
@@ -23,12 +23,6 @@
* that may change or not exist at all.
*/
-#ifndef HAVE_LIBZ
-/* Use our "real" copy of zutil.h if we don't use shared zlib */
-#include "zutil.h"
-
-#else /* HAVE_LIBZ: Shared zlib is used */
-
#define local static
#define DEF_MEM_LEVEL 8
#define zmemcpy sys_memcpy
@@ -77,6 +71,3 @@
# define OS_CODE 0x03 /* assume Unix */
#endif
-
-#endif /* HAVE_LIBZ */
-