From ac6178d747f7b3c50a61627c65d6a73ea6dcee5b Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 18 Jan 2006 12:46:11 +0000
Subject: [PATCH] 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
---
 include/wx/wxchar.h   | 6 ++++--
 src/regex/regcustom.h | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index aa2ff4a0a2..ad650d57e8 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -14,7 +14,9 @@
 #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 **);
@@ -48,7 +50,7 @@
 /*
     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!
  */
 
diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index 0e2d199121..cd77bf6dbe 100644
--- 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 "wx/defs.h"
 #include "wx/wxchar.h"
 
 /*