made wxFFile a bit more safe: don't crash when Tell() and Length() are called on...

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

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index cbd3bb9a31cb49382ad8d0e0904bb6794ea449d6..8f51782d53203ada45c1f83b38634a1cce6dfb0b 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -43,6 +43,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <limits.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_ */