From 08a01692bd4aa7a4afab28a12085a5e13175af4f Mon Sep 17 00:00:00 2001 From: gerstrong Date: Sat, 25 Jul 2009 16:54:23 +0000 Subject: [PATCH] Reverted WIN32 target-define back git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@168 4df4b0f3-56ce-47cb-b001-ed939b7d65a6 --- src/Debug.cpp | 6 +++--- src/Unicode.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Debug.cpp b/src/Debug.cpp index 1b01f70ba..3fb9f1aa6 100644 --- a/src/Debug.cpp +++ b/src/Debug.cpp @@ -14,7 +14,7 @@ #include -#ifdef WIN32__ +#ifdef WIN32 void RaiseDebugger() { #ifdef DEBUG @@ -119,7 +119,7 @@ void RaiseDebugger() { #endif -#ifdef WIN32__ +#ifdef WIN32 #include "AuxLib.h" // for Windows.h @@ -447,7 +447,7 @@ void DumpCallstack(void (*PrintOutFct) (const std::string&)) { free(strs); } -#elif defined(WIN32__) +#elif defined(WIN32) #include "StackWalker.h" // Call Luke Stackwalker for help diff --git a/src/Unicode.h b/src/Unicode.h index f7acce54c..e69747237 100644 --- a/src/Unicode.h +++ b/src/Unicode.h @@ -154,7 +154,7 @@ std::string Utf16ToUtf8(const Utf16String& str); Utf16String Utf8ToUtf16(const std::string& str); std::string UnicodeToUtf8(const UnicodeString& str); UnicodeString Utf8ToUnicode(const std::string& str); -#ifdef WIN32__ +#ifdef WIN32 std::string Utf8ToSystemNative(const std::string& utf8str); std::string SystemNativeToUtf8(const std::string& natstr); #else // Other platforms use natively utf8 (at least we suppose so)