diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-27 11:50:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-27 11:50:07 +0000 |
| commit | ddd1af0fdf37364c9472faedad941b4cc5f1b465 (patch) | |
| tree | d4eb46f481a47b6e16e40b39860e830e40f9dbcf /src | |
| parent | cc3be4384048697fe9b7716c11b7bd726b9ca650 (diff) | |
<tchar.h> removed from <m_system.h>
git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/path.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_utils.cpp | 14 | ||||
| -rw-r--r-- | src/mir_core/src/cmdline.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/winver.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mir_app/src/path.cpp b/src/mir_app/src/path.cpp index 2dc0860a35..c7dd2d468d 100644 --- a/src/mir_app/src/path.cpp +++ b/src/mir_app/src/path.cpp @@ -133,7 +133,7 @@ static __forceinline char* GetPathVarX(const char*, int code) return makeFileName(szFullPath);
}
-static __forceinline int _xcscmp(const wchar_t *s1, const wchar_t *s2) { return _tcscmp(s1, s2); }
+static __forceinline int _xcscmp(const wchar_t *s1, const wchar_t *s2) { return wcscmp(s1, s2); }
static __forceinline int _xcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n) { return wcsncmp(s1, s2, n); }
static __forceinline size_t _xcslen(const wchar_t *s1) { return wcslen(s1); }
static __forceinline wchar_t* _xcscpy(wchar_t *s1, const wchar_t *s2) { return wcscpy(s1, s2); }
diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 24af3b02c1..e91ece4c7e 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -181,25 +181,25 @@ MIR_APP_DLL(int) ProtoGetAvatarFormat(const wchar_t *ptszFileName) if (ptszExt == NULL)
return PA_FORMAT_UNKNOWN;
- if (!_tcsicmp(ptszExt, L".png"))
+ if (!wcsicmp(ptszExt, L".png"))
return PA_FORMAT_PNG;
- if (!_tcsicmp(ptszExt, L".jpg") || !_tcsicmp(ptszExt, L".jpeg"))
+ if (!wcsicmp(ptszExt, L".jpg") || !wcsicmp(ptszExt, L".jpeg"))
return PA_FORMAT_JPEG;
- if (!_tcsicmp(ptszExt, L".ico"))
+ if (!wcsicmp(ptszExt, L".ico"))
return PA_FORMAT_ICON;
- if (!_tcsicmp(ptszExt, L".bmp") || !_tcsicmp(ptszExt, L".rle"))
+ if (!wcsicmp(ptszExt, L".bmp") || !wcsicmp(ptszExt, L".rle"))
return PA_FORMAT_BMP;
- if (!_tcsicmp(ptszExt, L".gif"))
+ if (!wcsicmp(ptszExt, L".gif"))
return PA_FORMAT_GIF;
- if (!_tcsicmp(ptszExt, L".swf"))
+ if (!wcsicmp(ptszExt, L".swf"))
return PA_FORMAT_SWF;
- if (!_tcsicmp(ptszExt, L".xml"))
+ if (!wcsicmp(ptszExt, L".xml"))
return PA_FORMAT_XML;
return PA_FORMAT_UNKNOWN;
diff --git a/src/mir_core/src/cmdline.cpp b/src/mir_core/src/cmdline.cpp index c90eb11767..6489bde9d7 100644 --- a/src/mir_core/src/cmdline.cpp +++ b/src/mir_core/src/cmdline.cpp @@ -36,7 +36,7 @@ struct CmdLineParam static int CompareParams(const CmdLineParam *p1, const CmdLineParam *p2)
{
- return _tcscmp(p1->name, p2->name);
+ return wcscmp(p1->name, p2->name);
}
static OBJLIST<CmdLineParam> arParams(5, CompareParams);
diff --git a/src/mir_core/src/winver.cpp b/src/mir_core/src/winver.cpp index 8484f8ef71..cfbe338b81 100644 --- a/src/mir_core/src/winver.cpp +++ b/src/mir_core/src/winver.cpp @@ -71,7 +71,7 @@ MIR_CORE_DLL(BOOL) IsFullScreen() if (hWnd && hWnd != hWndDesktop && hWnd != hWndShell) {
wchar_t tszClassName[128] = L"";
GetClassName(hWnd, tszClassName, _countof(tszClassName));
- if (_tcscmp(tszClassName, L"WorkerW")) {
+ if (wcscmp(tszClassName, L"WorkerW")) {
RECT rect, rectw, recti;
GetWindowRect(hWnd, &rectw);
|