Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index aa2ff4a0a276936660327c0b164507a440189c62..ad650d57e8b68229b145a8fa5a461f50b8fcbb60 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -14,7 +14,9 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 

-#include "wx/defs.h"        /* for wxUSE_UNICODE */
+/* defs.h indirectly includes this file, so don't include it here */
+#include "wx/platform.h"
+#include "wx/dlimpexp.h"

 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);
 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);


@@ -48,7 +50,7 @@
 /*
     Standard headers we need here.
 
 /*
     Standard headers we need here.
 

-    NB: don't include any wxWidgets headers here because almost of them include
+    NB: don't include any wxWidgets headers here because almost all of them include

         this one!
  */
 
         this one!
  */
 

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index 0e2d199121fe9bd685f9085955749bcb1c2d5562..cd77bf6dbe7fd196f5c9cd9b3e34d18450098d45 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -36,6 +36,7 @@
 #include <string.h>
 
 /* must include this after ctype.h inclusion for CodeWarrior/Mac */
 #include <string.h>
 
 /* must include this after ctype.h inclusion for CodeWarrior/Mac */

+#include "wx/defs.h"

 #include "wx/wxchar.h"
 
 /*
 #include "wx/wxchar.h"
 
 /*