Remove K&R macros from zip declarations.

This macro is called _Z_OF on my system, not OF. But it's only
there to support K&R function declarations, so just get rid of it
entirely.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/access/zip/unzip/ioapi.c b/modules/access/zip/unzip/ioapi.c
index 301ae73e7184613442d312dcb3cb87cfef28a58f..42bd90367dca80e770009221da51401e429b7b7b 100644 (file)
--- a/modules/access/zip/unzip/ioapi.c
+++ b/modules/access/zip/unzip/ioapi.c
@@ -29,40 +29,40 @@
 #define SEEK_SET    0
 #endif
 
-voidpf ZCALLBACK fopen_file_func OF((
+voidpf ZCALLBACK fopen_file_func (
    voidpf opaque,
    const char* filename,
-   int mode));
+   int mode);
 
-uLong ZCALLBACK fread_file_func OF((
+uLong ZCALLBACK fread_file_func (
    voidpf opaque,
    voidpf stream,
    void* buf,
-   uLong size));
+   uLong size);
 
-uLong ZCALLBACK fwrite_file_func OF((
+uLong ZCALLBACK fwrite_file_func (
    voidpf opaque,
    voidpf stream,
    const void* buf,
-   uLong size));
+   uLong size);
 
-long ZCALLBACK ftell_file_func OF((
+long ZCALLBACK ftell_file_func (
    voidpf opaque,
-   voidpf stream));
+   voidpf stream);
 
-long ZCALLBACK fseek_file_func OF((
+long ZCALLBACK fseek_file_func (
    voidpf opaque,
    voidpf stream,
    uLong offset,
-   int origin));
+   int origin);
 
-int ZCALLBACK fclose_file_func OF((
+int ZCALLBACK fclose_file_func (
    voidpf opaque,
-   voidpf stream));
+   voidpf stream);
 
-int ZCALLBACK ferror_file_func OF((
+int ZCALLBACK ferror_file_func (
    voidpf opaque,
-   voidpf stream));
+   voidpf stream);
 
 
 voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)

diff --git a/modules/access/zip/unzip/ioapi.h b/modules/access/zip/unzip/ioapi.h
index 63ec641bfb053e0622a089198ca4735fac4222de..0dca45a4aed4d902b755e6f1c621df0a1cd24f8c 100644 (file)
--- a/modules/access/zip/unzip/ioapi.h
+++ b/modules/access/zip/unzip/ioapi.h
@@ -35,13 +35,13 @@
 extern "C" {
 #endif
 
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+typedef voidpf (ZCALLBACK *open_file_func) (voidpf opaque, const char* filename, int mode);
+typedef uLong  (ZCALLBACK *read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size);
+typedef uLong  (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
+typedef long   (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
+typedef long   (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
+typedef int    (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream);
+typedef int    (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
 
 typedef struct zlib_filefunc_def_s
 {
@@ -57,7 +57,7 @@ typedef struct zlib_filefunc_def_s
 
 
 
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def);
 
 #define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
 #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))