From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 17:42:08 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/StringConv.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'protocols/Twitter/StringConv.h') diff --git a/protocols/Twitter/StringConv.h b/protocols/Twitter/StringConv.h index c5266f574d..ec25c15ef7 100644 --- a/protocols/Twitter/StringConv.h +++ b/protocols/Twitter/StringConv.h @@ -39,20 +39,13 @@ inline std::wstring UTF8ToWide(const std::string& str) { return MBToWide(str, C inline std::string ANSIToUTF8(const std::string& str, UINT codePage = CP_ACP) { return WideToUTF8(MBToWide(str, codePage)); } inline std::string UTF8ToANSI(const std::string& str, UINT codePage = CP_ACP) { return WideToMB(UTF8ToWide(str), codePage); } -#ifdef _UNICODE + #define TCHARToUTF8 WideToUTF8 #define UTF8ToTCHAR UTF8ToWide #define TCHARToWide #define WideToTCHAR #define TCHARToMB WideToMB #define MBToTCHAR MBToWide -#else -#define TCHARToUTF8 ANSIToUTF8 -#define UTF8ToTCHAR UTF8ToANSI -#define TCHARToWide MBToWide -#define WideToTCHAR WideToMB -#define TCHARToMB -#define MBToTCHAR -#endif + #endif // StringConv_h__ -- cgit v1.2.3