(miniz/minizip) Compiles now on PS3

This commit is contained in:
twinaphex 2013-02-16 20:54:06 +01:00
parent c92decb983
commit 7ed3210acd
3 changed files with 6 additions and 6 deletions

2
deps/miniz/zlib.h vendored
View File

@ -394,7 +394,7 @@ const char *mz_error(int err);
#define Z_DEFLATED MZ_DEFLATED #define Z_DEFLATED MZ_DEFLATED
#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS #define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS
#define alloc_func mz_alloc_func #define alloc_func mz_alloc_func
#define free_func mz_free_func //#define free_func mz_free_func
#define internal_state mz_internal_state #define internal_state mz_internal_state
#define z_stream mz_stream #define z_stream mz_stream
#define deflateInit mz_deflateInit #define deflateInit mz_deflateInit

View File

@ -1036,10 +1036,10 @@ int unzOpenCurrentFile3 (unzFile file, int *method, int *level, int raw, const c
if ((s->cur_file_info.compression_method==Z_DEFLATED) && if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
(!raw)) (!raw))
{ {
pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; pfile_in_zip_read_info->stream.zalloc = (mz_alloc_func)0;
pfile_in_zip_read_info->stream.zfree = (free_func)0; pfile_in_zip_read_info->stream.zfree = (mz_free_func)0;
pfile_in_zip_read_info->stream.opaque = (voidpf)0; pfile_in_zip_read_info->stream.opaque = 0;
pfile_in_zip_read_info->stream.next_in = (const unsigned char*)0; pfile_in_zip_read_info->stream.next_in = 0;
pfile_in_zip_read_info->stream.avail_in = 0; pfile_in_zip_read_info->stream.avail_in = 0;
err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);

View File

@ -69,7 +69,7 @@ typedef voidp unzFile;
#define UNZ_END_OF_LIST_OF_FILE (-100) #define UNZ_END_OF_LIST_OF_FILE (-100)
#define UNZ_ERRNO (Z_ERRNO) #define UNZ_ERRNO (Z_ERRNO)
#define UNZ_EOF (0) #define UNZ_EOF (0)
#define UNZ_PARAMERROR (-102) #define UNZ_PARAMERROR (-102UL)
#define UNZ_BADZIPFILE (-103) #define UNZ_BADZIPFILE (-103)
#define UNZ_INTERNALERROR (-104) #define UNZ_INTERNALERROR (-104)
#define UNZ_CRCERROR (-105) #define UNZ_CRCERROR (-105)