revert minizip changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23455 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-03-04 15:15:40 +00:00
parent 770b230704
commit 1da98f9d61

View File

@ -65,7 +65,7 @@ int ZCALLBACK ferror_file_func OF((
voidpf stream)); 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; FILE* file = NULL;
const char* mode_fopen = 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; uLong ret;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); 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; uLong ret;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret; return ret;
} }
long ZCALLBACK ftell_file_func (voidpf /* opaque */, voidpf stream) long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
{ {
long ret; long ret;
ret = ftell((FILE *)stream); ret = ftell((FILE *)stream);
return ret; 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; int fseek_origin=0;
long ret; long ret;
@ -128,14 +128,14 @@ long ZCALLBACK fseek_file_func (voidpf /* opaque */, voidpf stream, uLong offset
return ret; return ret;
} }
int ZCALLBACK fclose_file_func (voidpf /* opaque */, voidpf stream) int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
{ {
int ret; int ret;
ret = fclose((FILE *)stream); ret = fclose((FILE *)stream);
return ret; return ret;
} }
int ZCALLBACK ferror_file_func (voidpf /* opaque */, voidpf stream) int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
{ {
int ret; int ret;
ret = ferror((FILE *)stream); ret = ferror((FILE *)stream);