Commit f29ec9cd authored by Timothy B. Terriberry's avatar Timothy B. Terriberry Committed by Jean-Baptiste Kempf

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: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a8271c46
...@@ -29,40 +29,40 @@ ...@@ -29,40 +29,40 @@
#define SEEK_SET 0 #define SEEK_SET 0
#endif #endif
voidpf ZCALLBACK fopen_file_func OF(( voidpf ZCALLBACK fopen_file_func (
voidpf opaque, voidpf opaque,
const char* filename, const char* filename,
int mode)); int mode);
uLong ZCALLBACK fread_file_func OF(( uLong ZCALLBACK fread_file_func (
voidpf opaque, voidpf opaque,
voidpf stream, voidpf stream,
void* buf, void* buf,
uLong size)); uLong size);
uLong ZCALLBACK fwrite_file_func OF(( uLong ZCALLBACK fwrite_file_func (
voidpf opaque, voidpf opaque,
voidpf stream, voidpf stream,
const void* buf, const void* buf,
uLong size)); uLong size);
long ZCALLBACK ftell_file_func OF(( long ZCALLBACK ftell_file_func (
voidpf opaque, voidpf opaque,
voidpf stream)); voidpf stream);
long ZCALLBACK fseek_file_func OF(( long ZCALLBACK fseek_file_func (
voidpf opaque, voidpf opaque,
voidpf stream, voidpf stream,
uLong offset, uLong offset,
int origin)); int origin);
int ZCALLBACK fclose_file_func OF(( int ZCALLBACK fclose_file_func (
voidpf opaque, voidpf opaque,
voidpf stream)); voidpf stream);
int ZCALLBACK ferror_file_func OF(( int ZCALLBACK ferror_file_func (
voidpf opaque, voidpf opaque,
voidpf stream)); voidpf stream);
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
......
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
extern "C" { extern "C" {
#endif #endif
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); typedef voidpf (ZCALLBACK *open_file_func) (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 *read_file_func) (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 uLong (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); typedef int (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream);
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); typedef int (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
typedef struct zlib_filefunc_def_s typedef struct zlib_filefunc_def_s
{ {
...@@ -57,7 +57,7 @@ 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 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)) #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment