Minor header cleaning.

[wxWidgets.git] / src / regex / regcustom.h

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index 825a3c35e7477fbb8333a34c5af86751f3e2fb3e..cd77bf6dbe7fd196f5c9cd9b3e34d18450098d45 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -26,9 +26,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

-/* headers if any */
-#include "wx/wxchar.h"
-

 /* overrides for regguts.h definitions, if any */
 /* regguts only includes standard headers if NULL is not defined, so do it
  * ourselves here */
 /* overrides for regguts.h definitions, if any */
 /* regguts only includes standard headers if NULL is not defined, so do it
  * ourselves here */


@@ -38,6 +35,10 @@
 #include <limits.h>
 #include <string.h>
 
 #include <limits.h>
 #include <string.h>
 

+/* must include this after ctype.h inclusion for CodeWarrior/Mac */
+#include "wx/defs.h"
+#include "wx/wxchar.h"
+

 /*
  * Do not insert extras between the "begin" and "end" lines -- this
  * chunk is automatically extracted to be fitted into regex.h.
 /*
  * Do not insert extras between the "begin" and "end" lines -- this
  * chunk is automatically extracted to be fitted into regex.h.


@@ -70,8 +71,8 @@
 #endif
 #if wxUSE_UNICODE
 #   define  __REG_WIDE_T        wxChar
 #endif
 #if wxUSE_UNICODE
 #   define  __REG_WIDE_T        wxChar

-#   define  __REG_WIDE_COMPILE  re_comp
-#   define  __REG_WIDE_EXEC     re_exec
+#   define  __REG_WIDE_COMPILE  wx_re_comp
+#   define  __REG_WIDE_EXEC     wx_re_exec

 #   define  __REG_NOCHAR        /* don't want the char versions */
 #endif
 #define __REG_NOFRONT           /* don't want regcomp() and regexec() */
 #   define  __REG_NOCHAR        /* don't want the char versions */
 #endif
 #define __REG_NOFRONT           /* don't want regcomp() and regexec() */


@@ -113,8 +114,8 @@ typedef int celt;               /* type to hold chr, MCCE number, or NOCELT */
 #define iscspace(x)     ((wxUChar)(x) < 128 && isspace(x))
 
 /* name the external functions */
 #define iscspace(x)     ((wxUChar)(x) < 128 && isspace(x))
 
 /* name the external functions */

-#define compile         re_comp
-#define exec            re_exec
+#define compile         wx_re_comp
+#define exec            wx_re_exec

 
 /* enable/disable debugging code (by whether REG_DEBUG is defined or not) */
 #if 0           /* no debug unless requested by makefile */
 
 /* enable/disable debugging code (by whether REG_DEBUG is defined or not) */
 #if 0           /* no debug unless requested by makefile */