missing commit

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

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index ec64f5fb6ed7772c9065a3d9d483e05703d1608d..69e7c92069184fc7e5bad418d659d8e1005d5078 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -36,7 +36,9 @@
 #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/wxchar.h"
+#include "wx/defs.h"
+#include "wx/chartype.h"
+#include "wx/wxcrtbase.h"

 
 /*
  * Do not insert extras between the "begin" and "end" lines -- this
 
 /*
  * Do not insert extras between the "begin" and "end" lines -- this


@@ -70,8 +72,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 +115,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 */