diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
| commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
| tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /libs/zlib/src/ioapi.c | |
| parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) | |
less TCHARs:
- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*
git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'libs/zlib/src/ioapi.c')
| -rw-r--r-- | libs/zlib/src/ioapi.c | 14 |
1 files changed, 7 insertions, 7 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; } |