Include gz_header definition when compiling zlib solo.

a8d23bb6 · Mark Adler · 98e5787e · a8d23bb6 · a8d23bb6 · a8d23bb6
隐藏空白更改
内联并排

Showing with 9 addition and 15 deletion

zconf.h zconf.h +3 -5

zconf.h.cmakein zconf.h.cmakein +3 -5

zconf.h.in zconf.h.in +3 -5

未找到文件。
--- 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

--- 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

--- 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