From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2007 14:22:05 +0000 (+0000)
Subject: don't redefine __WCHAR_TYPE__ when using Sun CC if it's already defined (as is the... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b69ae27a0527bb5a9676624754c18a6f45386752

don't redefine __WCHAR_TYPE__ when using Sun CC if it's already defined (as is the case at least under Linux)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index 5162b91daf..a9e2dee892 100644
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -154,8 +154,8 @@
     /* Sun's SunPro compiler supports the wchar_t type and wide character    */
     /* functions, but does not define __WCHAR_TYPE__. Define it here to      */
     /* allow unicode enabled builds.                                         */
-    #if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
-    #define __WCHAR_TYPE__ wxchar_t
+    #if (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && !defined(__WCHAR_TYPE__)
+        #define __WCHAR_TYPE__ wxchar_t
     #endif
 
     /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */