diff options
Diffstat (limited to 'libs/zlib/src')
| -rw-r--r-- | libs/zlib/src/ioapi.c | 14 | ||||
| -rw-r--r-- | libs/zlib/src/ioapi.h | 2 | ||||
| -rw-r--r-- | libs/zlib/src/iowin32.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libs/zlib/src/ioapi.c b/libs/zlib/src/ioapi.c index de9151aae5..815c9035c4 100644 --- a/libs/zlib/src/ioapi.c +++ b/libs/zlib/src/ioapi.c @@ -33,7 +33,7 @@ voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc, const void*filename if (pfilefunc->zfile_func64.zopen64_file != NULL) return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque, filename, mode); else { - return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque, (const TCHAR*)filename, mode); + return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque, (const wchar_t*)filename, mode); } } @@ -81,7 +81,7 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef -static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const TCHAR* filename, int mode)); +static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const wchar_t* filename, int mode)); static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream)); @@ -89,10 +89,10 @@ static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPO static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream)); static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream)); -static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const TCHAR* filename, int mode) +static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const wchar_t* filename, int mode) { FILE* file = NULL; - const TCHAR* mode_fopen = NULL; + const wchar_t* mode_fopen = NULL; if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ) mode_fopen = L"rb"; else @@ -103,14 +103,14 @@ static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const TCHAR* filename, in mode_fopen = L"wb"; if ((filename != NULL) && (mode_fopen != NULL)) - file = _tfopen(filename, mode_fopen); + file = _wfopen(filename, mode_fopen); return file; } static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, int mode) { FILE* file = NULL; - const TCHAR* mode_fopen = NULL; + const wchar_t* mode_fopen = NULL; if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ) mode_fopen = L"rb"; else @@ -121,7 +121,7 @@ static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, i mode_fopen = L"wb"; if ((filename != NULL) && (mode_fopen != NULL)) - file = _tfopen((const TCHAR*)filename, mode_fopen); + file = _wfopen((const wchar_t*)filename, mode_fopen); return file; } diff --git a/libs/zlib/src/ioapi.h b/libs/zlib/src/ioapi.h index 20cacd9427..7dda60e52a 100644 --- a/libs/zlib/src/ioapi.h +++ b/libs/zlib/src/ioapi.h @@ -133,7 +133,7 @@ extern "C" { -typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const TCHAR* filename, int mode)); +typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const wchar_t* filename, int mode)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); diff --git a/libs/zlib/src/iowin32.c b/libs/zlib/src/iowin32.c index 8b4ea93970..dbca36fb19 100644 --- a/libs/zlib/src/iowin32.c +++ b/libs/zlib/src/iowin32.c @@ -32,7 +32,7 @@ #endif #endif -voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const TCHAR* filename, int mode)); +voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const wchar_t* filename, int mode)); uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); @@ -155,7 +155,7 @@ voidpf ZCALLBACK win32_open64_file_funcW(voidpf opaque, const void* filename, in return win32_build_iowin(hFile); } -voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const TCHAR* filename, int mode) +voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const wchar_t* filename, int mode) { const char* mode_fopen = NULL; DWORD dwDesiredAccess, dwCreationDisposition, dwShareMode, dwFlagsAndAttributes; |