diff options
Diffstat (limited to 'src/3rdparty/assimp/contrib/unzip/ioapi.c')
| -rw-r--r-- | src/3rdparty/assimp/contrib/unzip/ioapi.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/3rdparty/assimp/contrib/unzip/ioapi.c b/src/3rdparty/assimp/contrib/unzip/ioapi.c index b7200df75..f1bee23e6 100644 --- a/src/3rdparty/assimp/contrib/unzip/ioapi.c +++ b/src/3rdparty/assimp/contrib/unzip/ioapi.c @@ -10,11 +10,7 @@ #include <stdlib.h> #include <string.h> -# ifdef ASSIMP_BUILD_NO_OWN_ZLIB -# include <zlib.h> -# else -# include "../zlib/zlib.h" -# endif +#include "zlib.h" #include "ioapi.h" @@ -33,40 +29,40 @@ #define SEEK_SET 0 #endif -voidpf ZCALLBACK fopen_file_func ( +voidpf ZCALLBACK fopen_file_func OF(( voidpf opaque, const char* filename, - int mode); + int mode)); -uLong ZCALLBACK fread_file_func ( +uLong ZCALLBACK fread_file_func OF(( voidpf opaque, voidpf stream, void* buf, - uLong size); + uLong size)); -uLong ZCALLBACK fwrite_file_func ( +uLong ZCALLBACK fwrite_file_func OF(( voidpf opaque, voidpf stream, const void* buf, - uLong size); + uLong size)); -long ZCALLBACK ftell_file_func ( +long ZCALLBACK ftell_file_func OF(( voidpf opaque, - voidpf stream); + voidpf stream)); -long ZCALLBACK fseek_file_func ( +long ZCALLBACK fseek_file_func OF(( voidpf opaque, voidpf stream, uLong offset, - int origin); + int origin)); -int ZCALLBACK fclose_file_func ( +int ZCALLBACK fclose_file_func OF(( voidpf opaque, - voidpf stream); + voidpf stream)); -int ZCALLBACK ferror_file_func ( +int ZCALLBACK ferror_file_func OF(( voidpf opaque, - voidpf stream); + voidpf stream)); voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) |