<tchar.h> removed from <m_system.h>

git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 8 insertions, 8 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;