mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-28 14:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1) Avoid namespace collision

Browse Source
This commit is contained in:
twinaphex 2013-02-16 21:54:45 +01:00
parent 9a88ebb1e6
commit fa929ddb4f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/miniz/miniz.c vendored
View File

@ -254,7 +254,7 @@ int mz_inflate(mz_streamp pStream, int flush)
return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
}
int inflateEnd(mz_streamp pStream)
int mz_inflateEnd(mz_streamp pStream)
{
if (!pStream)
return MZ_STREAM_ERROR;
@ -287,12 +287,12 @@ int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char
status = mz_inflate(&stream, MZ_FINISH);
if (status != MZ_STREAM_END)
{
inflateEnd(&stream);
mz_inflateEnd(&stream);
return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status;
}
*pDest_len = stream.total_out;
return inflateEnd(&stream);
return mz_inflateEnd(&stream);
}
const char *mz_error(int err)

3
deps/miniz/zlib.h vendored
View File

@ -342,7 +342,7 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits);
int mz_inflate(mz_streamp pStream, int flush);
// Deinitializes a decompressor.
int inflateEnd(mz_streamp pStream);
int mz_inflateEnd(mz_streamp pStream);
// Single-call decompression.
// Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure.
@ -409,6 +409,7 @@ const char *mz_error(int err);
#define inflateInit mz_inflateInit
#define inflateInit2 mz_inflateInit2
#define inflate mz_inflate
#define inflateEnd mz_inflateEnd
#define uncompress mz_uncompress
#define crc32 crc32
#define adler32 mz_adler32