From a8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8 Mon Sep 17 00:00:00 2001 From: Mark Adler <madler@alumni.caltech.edu> Date: Wed, 1 Feb 2012 22:41:52 -0800 Subject: [PATCH] Include gz_header definition when compiling zlib solo. --- zconf.h | 8 +++----- zconf.h.cmakein | 8 +++----- zconf.h.in | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/zconf.h b/zconf.h index 51c80ac..71adb18 100644 --- a/zconf.h +++ b/zconf.h @@ -127,9 +127,9 @@ # define free_func z_free_func # ifndef Z_SOLO # define gzFile z_gzFile -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp # endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp # define in_func z_in_func # define intf z_intf # define out_func z_out_func @@ -142,9 +142,7 @@ # define voidpf z_voidpf /* all zlib structs in zlib.h and zconf.h */ -# ifndef Z_SOLO -# define gz_header_s z_gz_header_s -# endif +# define gz_header_s z_gz_header_s # define internal_state z_internal_state #endif diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 3ea5531..325f93c 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -129,9 +129,9 @@ # define free_func z_free_func # ifndef Z_SOLO # define gzFile z_gzFile -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp # endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp # define in_func z_in_func # define intf z_intf # define out_func z_out_func @@ -144,9 +144,7 @@ # define voidpf z_voidpf /* all zlib structs in zlib.h and zconf.h */ -# ifndef Z_SOLO -# define gz_header_s z_gz_header_s -# endif +# define gz_header_s z_gz_header_s # define internal_state z_internal_state #endif diff --git a/zconf.h.in b/zconf.h.in index 51c80ac..71adb18 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -127,9 +127,9 @@ # define free_func z_free_func # ifndef Z_SOLO # define gzFile z_gzFile -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp # endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp # define in_func z_in_func # define intf z_intf # define out_func z_out_func @@ -142,9 +142,7 @@ # define voidpf z_voidpf /* all zlib structs in zlib.h and zconf.h */ -# ifndef Z_SOLO -# define gz_header_s z_gz_header_s -# endif +# define gz_header_s z_gz_header_s # define internal_state z_internal_state #endif