From 1da98f9d615afb3802f9bbacbc92297acb7ef6b0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 4 Mar 2008 15:15:40 +0000 Subject: [PATCH] revert minizip changes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23455 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/minizip/ioapi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/support/minizip/ioapi.c b/src/support/minizip/ioapi.c index c37d94dde0..704c9112c6 100644 --- a/src/support/minizip/ioapi.c +++ b/src/support/minizip/ioapi.c @@ -65,7 +65,7 @@ int ZCALLBACK ferror_file_func OF(( voidpf stream)); -voidpf ZCALLBACK fopen_file_func (voidpf /* opaque */, const char* filename, int mode) +voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) { FILE* file = NULL; const char* mode_fopen = NULL; @@ -84,7 +84,7 @@ voidpf ZCALLBACK fopen_file_func (voidpf /* opaque */, const char* filename, int } -uLong ZCALLBACK fread_file_func (voidpf /* opaque */, voidpf stream, void* buf, uLong size) +uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) { uLong ret; ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); @@ -92,21 +92,21 @@ uLong ZCALLBACK fread_file_func (voidpf /* opaque */, voidpf stream, void* buf, } -uLong ZCALLBACK fwrite_file_func (voidpf /* opaque */, voidpf stream, const void* buf, uLong size) +uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) { uLong ret; ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); return ret; } -long ZCALLBACK ftell_file_func (voidpf /* opaque */, voidpf stream) +long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) { long ret; ret = ftell((FILE *)stream); return ret; } -long ZCALLBACK fseek_file_func (voidpf /* opaque */, voidpf stream, uLong offset, int origin) +long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) { int fseek_origin=0; long ret; @@ -128,14 +128,14 @@ long ZCALLBACK fseek_file_func (voidpf /* opaque */, voidpf stream, uLong offset return ret; } -int ZCALLBACK fclose_file_func (voidpf /* opaque */, voidpf stream) +int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) { int ret; ret = fclose((FILE *)stream); return ret; } -int ZCALLBACK ferror_file_func (voidpf /* opaque */, voidpf stream) +int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) { int ret; ret = ferror((FILE *)stream);