diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-27 14:23:31 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-27 14:23:31 +0000 |
| commit | 2f261839b60692e33d0e160344d0d636d49c90ba (patch) | |
| tree | 187921722698b681d29df3f6e60fb18394a5e9d5 /include/m_core.h | |
| parent | 2e931a0b2780587d85f3902468c935f5adba70c8 (diff) | |
less TCHARs
git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/m_core.h')
| -rw-r--r-- | include/m_core.h | 94 |
1 files changed, 1 insertions, 93 deletions
diff --git a/include/m_core.h b/include/m_core.h index 8b7e4d80fa..353eba25fa 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -437,90 +437,6 @@ typedef union { wchar_t **w; // array of strings of WCHARs
} MAllStringArray;
-#ifdef _UNICODE
- #define mir_t2a(s) mir_u2a(s)
- #define mir_a2t(s) mir_a2u(s)
- #define mir_t2u(s) mir_wstrdup(s)
- #define mir_u2t(s) mir_wstrdup(s)
-
- #define mir_t2a_cp(s,c) mir_u2a_cp(s,c)
- #define mir_a2t_cp(s,c) mir_a2u_cp(s,c)
- #define mir_t2u_cp(s,c) mir_wstrdup(s)
- #define mir_u2t_cp(s,c) mir_wstrdup(s)
-
- #define mir_tstrlen mir_wstrlen
- #define mir_tstrcpy mir_wstrcpy
- #define mir_tstrncpy mir_wstrncpy
- #define mir_tstrcat mir_wstrcat
- #define mir_tstrncat mir_wstrncat
- #define mir_tstrcmp mir_wstrcmp
- #define mir_tstrcmpi mir_wstrcmpi
- #define mir_tstrncmp mir_wstrncmp
- #define mir_tstrncmpi mir_wstrncmpi
- #define mir_tstrdup mir_wstrdup
- #define mir_tstrndup mir_wstrndup
-
- #define replaceStrT replaceStrW
- #define bin2hexT bin2hexW
- #define hex2binT hex2binW
-
- #define rtrimt rtrimw
- #define ltrimt ltrimw
- #define ltrimpt ltrimpw
-
- #define strdelt strdelw
-
- #define wildcmpt wildcmpw
- #define wildcmpit wildcmpiw
-
- #define mir_sntprintf mir_snwprintf
- #define mir_vsntprintf mir_vsnwprintf
-
- #define mir_writeLogT mir_writeLogW
- #define mir_writeLogVT mir_writeLogVW
-#else
- #define mir_t2a(s) mir_strdup(s)
- #define mir_a2t(s) mir_strdup(s)
- #define mir_t2u(s) mir_a2u(s)
- #define mir_u2t(s) mir_u2a(s)
-
- #define mir_t2a_cp(s,c) mir_strdup(s)
- #define mir_a2t_cp(s,c) mir_strdup(s)
- #define mir_t2u_cp(s,c) mir_a2u_cp(s,c)
- #define mir_u2t_cp(s,c) mir_u2a_cp(s,c)
-
- #define mir_tstrlen mir_strlen
- #define mir_tstrcpy mir_strcpy
- #define mir_tstrncpy mir_strncpy
- #define mir_tstrcat mir_strcat
- #define mir_tstrncat mir_strncat
- #define mir_tstrcmp mir_strcmp
- #define mir_tstrcmpi mir_strcmpi
- #define mir_tstrncmp mir_strncmp
- #define mir_tstrncmpi mir_strncmpi
- #define mir_tstrdup mir_strdup
- #define mir_tstrndup mir_strndup
-
- #define replaceStrT replaceStr
- #define bin2hexT bin2hex
- #define hex2binT hex2bin
-
- #define rtrimt rtrim
- #define ltrimt ltrim
- #define ltrimpt ltrimp
-
- #define strdelt strdel
-
- #define wildcmpt wildcmp
- #define wildcmpit wildcmpi
-
- #define mir_sntprintf mir_snprintf
- #define mir_vsntprintf mir_vsnprintf
-
- #define mir_writeLogT mir_writeLogA
- #define mir_writeLogVT mir_writeLogVA
-#endif
-
MIR_CORE_DLL(wchar_t*) mir_a2u_cp(const char* src, int codepage);
MIR_CORE_DLL(wchar_t*) mir_a2u(const char* src);
MIR_CORE_DLL(char*) mir_u2a_cp(const wchar_t* src, int codepage);
@@ -585,19 +501,11 @@ MIR_CORE_DLL(BOOL) Utf8CheckString(const char* str); __forceinline char* mir_utf8decodeA(const char* src)
{
- char* tmp = mir_strdup(src);
+ char *tmp = mir_strdup(src);
mir_utf8decode(tmp, NULL);
return tmp;
}
-#if defined(_UNICODE)
- #define mir_utf8decodeT mir_utf8decodeW
- #define mir_utf8encodeT mir_utf8encodeW
-#else
- #define mir_utf8decodeT mir_utf8decodeA
- #define mir_utf8encodeT mir_utf8encode
-#endif
-
///////////////////////////////////////////////////////////////////////////////
// Window subclassing
|