From: Daniel Axtens <dja@axtens.net>
Date: Fri, 8 May 2015 06:09:09 +0000 (+1000)
Subject: Kill Z_ARG()
X-Git-Tag: 1.9.9-b1~856
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45e4f2b848ff63b21812c77c6d9bf3b13746b11f;p=thirdparty%2Fzlib-ng.git

Kill Z_ARG()

Signed-off-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/zconf.h.in b/zconf.h.in
index 631a744c1..4fc4ac739 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -61,10 +61,6 @@
                         /* Type declarations */
 
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  define Z_ARG(args)  args
-#endif
-
 #if defined(WINDOWS) || defined(WIN32)
    /* If building or using zlib as a DLL, define ZLIB_DLL.
     * This is not mandatory, but it offers a little performance increase.
diff --git a/zlib.h b/zlib.h
index 5488524ff..b8ef5f5a4 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1343,7 +1343,7 @@ ZEXTERN int ZEXPORT gzwrite (gzFile file, void const *buf, unsigned len);
    error.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf (gzFile file, const char *format, ...);
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
@@ -1738,7 +1738,7 @@ ZEXTERN int            ZEXPORT deflateResetKeep (z_stream *);
 ZEXTERN gzFile         ZEXPORT gzopen_w (const wchar_t *path, const char *mode);
 #endif
 #ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file, const char *format, va_list va));
+ZEXTERN int            ZEXPORTVA gzvprintf (gzFile file, const char *format, va_list va);
 #endif
 
 #ifdef __cplusplus