removed wxUSE_BUILTIN_REGEX

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

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index f5486920e7c8789acd2a462aa07b11a112fbbcd4..c4ff85749e3312a3d76482bd8253dae5a3ad0157 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -1,3 +1,6 @@
+#ifndef _REGEX_CUSTOM_H_
+#define _REGEX_CUSTOM_H_
+
 /*
  * Copyright (c) 1998, 1999 Henry Spencer.     All rights reserved.
  *
@@ -29,28 +32,29 @@
  */
 
 /* headers if any */
-#include <sys/types.h>
+
+/*  FreeBSD, Watcom and DMars require this, CW doesn't have nor need it. */
+/*  Others also don't seem to need it. If you have an error related to */
+/*  (not) including <sys/types.h> please report details to */
+/*  wx-dev@lists.wxwindows.org */
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
+#   include <sys/types.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#ifndef wxCHECK_GCC_VERSION
-#define wxCHECK_GCC_VERSION( major, minor ) \
-    ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
-    && ( ( __GNUC__ > (major) ) \
-        || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
-#endif
 
-#if !wxUSE_UNICODE
-#      define wx_wchar char
-#else // Unicode
-    #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96))
-    #          define wx_wchar __WCHAR_TYPE__ 
-    #else // __WCHAR_TYPE__ and gcc < 2.96
-        // standard case
-        #              define wx_wchar wchar_t         
-    #endif // __WCHAR_TYPE__
-#endif // ASCII/Unicode
+#include "wx/wxchar.h"
+
+/**
+*
+*   wx_wchar == wxChar
+*   
+*/
+#define wx_wchar wxChar
 
 /* overrides for regguts.h definitions, if any */
 #define FUNCPTR(name, args) (*name) args
@@ -70,14 +74,10 @@ typedef long celt;                          /* type to hold chr, MCCE number, or
                                                                                 * literal */
 #define DIGITVAL(c) ((c)-'0')  /* turn chr digit into its value */
 
-/*  RN - the "not use sizeof() thing is really asanine!" */
-#ifdef wxUSE_UNICODE
-#      define CHRBITS 8
-#else
-#      define CHRBITS 32                       /* bits in a chr; must not use sizeof */
-#endif
+#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 */
-#define CHR_MAX (1 << CHRBITS) /*0xfffffffe*/          /* CHR_MAX-CHR_MIN+1 should fit in uchr */
+
 
 /* functions operating on chr */
 #define iscalnum(x) wx_isalnum(x)
@@ -87,3 +87,5 @@ typedef long celt;                            /* type to hold chr, MCCE number, or
 
 /* and pick up the standard header */
 #include "regex.h"
+
+#endif /* _REGEX_CUSTOM_H_ */