Fixed setup.h logic again

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

diff --git a/src/regex/regex.h b/src/regex/regex.h
index a1fcec2e1c0fe1b684b5a8e2f77765b3ec27c926..304e15d95e5af0ec6d8d45e0e570964f321277b5 100644 (file)
--- a/src/regex/regex.h
+++ b/src/regex/regex.h
@@ -1,5 +1,6 @@
 #ifndef _REGEX_H_
 #define        _REGEX_H_       /* never again */
 #ifndef _REGEX_H_
 #define        _REGEX_H_       /* never again */

+

 /*
  * regular expressions
  *
 /*
  * regular expressions
  *


@@ -39,28 +40,26 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-#include <sys/types.h>
+/*****************************
+    WXWINDOWS CUSTOM 
+*****************************/
+#ifndef _REGEX_CUSTOM_H_
+#   define wx_wchar wxChar
+/*  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
+#endif /* ndef _REGEX_CUSTOM_H_ */
+/*****************************
+    END WXWINDOWS CUSTOM
+*****************************/
+

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.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
-

 /*
  * interface types etc.
  */
 /*
  * interface types etc.
  */