X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aff909dd4f5076d56d79f15eaef85549e517ab80..8611662072d09a578096fc73d7b44933e206b85c:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0a027c9971..71a7b95083 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -18,12 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __EMX__
-// The following define is needed by Innotek's libc to
-// make the definition of struct localeconv available.
-#define __INTERNAL_DEFS
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,6 +25,12 @@
     #pragma hdrstop
 #endif
 
+#ifdef __EMX__
+// The following define is needed by Innotek's libc to
+// make the definition of struct localeconv available.
+#define __INTERNAL_DEFS
+#endif
+
 #if wxUSE_INTL
 
 #ifndef WX_PRECOMP
@@ -1742,7 +1742,7 @@ bool wxLocale::Init(int language, int flags)
     //
     // this contradicts IBM own docs but this is not of much help, so just work
     // around it in the crudest possible manner
-    char *p = wxStrchr(retloc, ' ');
+    char* p = const_cast<char*>(wxStrchr(retloc, ' '));
     if ( p )
         *p = '\0';
 #endif // __AIX__