Merge branch 'master' into v2.92c

contrib/infback9/README

@@ -11,3 +11,4 @@ This copy of zlib 1.2.11's unsupported infback9 code has been modified as follow
 * Fixed a fall-through warning.
 * Replaced references to zcalloc and zcfree with inline implementations. This
   is due to older versions of zlib seemingly not exposing these.
+* Removed OF() wrapper for function declarations (unnecessary).

contrib/infback9/infback9.h

@@ -23,14 +23,14 @@
 extern "C" {
 #endif
 
-ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
+ZEXTERN int ZEXPORT inflateBack9 (z_stream FAR *strm,
                                     in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm));
-ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
+                                    out_func out, void FAR *out_desc);
+ZEXTERN int ZEXPORT inflateBack9End (z_stream FAR *strm);
+ZEXTERN int ZEXPORT inflateBack9Init_ (z_stream FAR *strm,
                                          unsigned char FAR *window,
                                          const char *version,
-                                         int stream_size));
+                                         int stream_size);
 #define inflateBack9Init(strm, window) \
         inflateBack9Init_((strm), (window), \
         ZLIB_VERSION, sizeof(z_stream))

contrib/infback9/inftree9.h

@@ -59,7 +59,7 @@ typedef enum {
     DISTS
 } codetype;
 
-extern int inflate_table9 OF((codetype type, unsigned short FAR *lens,
+extern int inflate_table9 (codetype type, unsigned short FAR *lens,
                              unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+                             unsigned FAR *bits, unsigned short FAR *work);
 #endif