diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-02-03 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:15:59 +0300 |
| commit | 8874e4fbc9faabdcff719b9b2ac8ebad4f282bbe (patch) | |
| tree | 4180f817b3d10dc34cde8b7ccc8c589eae4b26d3 /CPP/Common | |
| parent | 1dc92281fa580c11a79fef9fc862a6ce354a76ac (diff) | |
4.654.65
Diffstat (limited to 'CPP/Common')
| -rwxr-xr-x | CPP/Common/MyString.cpp | 12 | ||||
| -rwxr-xr-x | CPP/Common/MyString.h | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/CPP/Common/MyString.cpp b/CPP/Common/MyString.cpp index 41c0c95d..2c02e822 100755 --- a/CPP/Common/MyString.cpp +++ b/CPP/Common/MyString.cpp @@ -2,12 +2,14 @@ #include "StdAfx.h" -#ifdef _WIN32 -#include "StringConvert.h" -#else +#ifndef _WIN32 #include <ctype.h> #endif +#ifndef _UNICODE +#include "StringConvert.h" +#endif + #include "MyString.h" @@ -190,9 +192,9 @@ int MyStringCompareNoCase(const wchar_t *s1, const wchar_t *s2) } } -#ifdef _WIN32 +/* int MyStringCompareNoCase(const char *s1, const char *s2) { return MyStringCompareNoCase(MultiByteToUnicodeString(s1), MultiByteToUnicodeString(s2)); } -#endif +*/ diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h index 82b97618..bae239da 100755 --- a/CPP/Common/MyString.h +++ b/CPP/Common/MyString.h @@ -100,10 +100,7 @@ int MyStringCollateNoCase(const wchar_t *s1, const wchar_t *s2); int MyStringCompare(const char *s1, const char *s2); int MyStringCompare(const wchar_t *s1, const wchar_t *s2); -#ifdef _WIN32 -int MyStringCompareNoCase(const char *s1, const char *s2); -#endif - +// int MyStringCompareNoCase(const char *s1, const char *s2); int MyStringCompareNoCase(const wchar_t *s1, const wchar_t *s2); template <class T> |