X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85b6c59b8967e04997c6a0e89b115ff1349d7adf..b9b1f368fe78f4f52dd355faf9f7c0672659697d:/src/regex/regcustom.h?ds=sidebyside

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index bd55210c37..8f51782d53 100644
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -43,10 +43,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 
-#include "./../../include/wx/wxchar.h"
+#include "wx/wxchar.h"
 
 /**
 *
@@ -73,10 +74,15 @@ typedef long celt;				/* type to hold chr, MCCE number, or
 										 * literal */
 #define DIGITVAL(c) ((c)-'0')	/* turn chr digit into its value */
 
-#define CHRBITS (SIZEOF_WCHAR_T << 3)			/* bits in a chr; must not use sizeof */
-#define CHR_MAX ((1 << CHRBITS) - 1)
-#define CHR_MIN 0x00000000		/* smallest and largest chr; the value */
-
+#if wxUSE_WCHAR_T
+#   define CHRBITS (SIZEOF_WCHAR_T << 3)			/* bits in a chr; must not use sizeof */
+#   define CHR_MAX ((1 << CHRBITS) - 1)
+#   define CHR_MIN 0x00000000		/* smallest and largest chr; the value */
+#else /*ANSI*/
+#   define CHRBITS 8
+#   define CHR_MAX 0xFF
+#   define CHR_MIN 0x00
+#endif /*wxUSE_WCHAR_T*/
 
 /* functions operating on chr */
 #define iscalnum(x) wx_isalnum(x)
@@ -84,7 +90,9 @@ typedef long celt;				/* type to hold chr, MCCE number, or
 #define iscdigit(x) wx_isdigit(x)
 #define iscspace(x) wx_isspace(x)
 
+extern int  wx_strlen(const wx_wchar* szString);
+
 /* and pick up the standard header */
 #include "regex.h"
 
-#endif /* _REGEX_CUSTOM_H_ */
\ No newline at end of file
+#endif /* _REGEX_CUSTOM_H_ */