Wrap some functions with wxAutoNSAutoreleasePool

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

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index ddc99fe722db1f799b950c6cf8f4e2ac1f9c7145..a53cf621caed0bef501a419d8ea413a8ce2d1129 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -50,13 +50,13 @@
 #endif
 
 #if !wxUSE_UNICODE
 #endif
 
 #if !wxUSE_UNICODE

-#      define wx_wchar char
+#   define wx_wchar char

 #else // Unicode
     #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96))
 #else // Unicode
     #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96))

-    #          define wx_wchar __WCHAR_TYPE__ 
+    #       define wx_wchar __WCHAR_TYPE__ 

     #else // __WCHAR_TYPE__ and gcc < 2.96
         // standard case
     #else // __WCHAR_TYPE__ and gcc < 2.96
         // standard case

-        #              define wx_wchar wchar_t         
+        #       define wx_wchar wchar_t         

     #endif // __WCHAR_TYPE__
 #endif // ASCII/Unicode
 
     #endif // __WCHAR_TYPE__
 #endif // ASCII/Unicode
 


@@ -80,18 +80,34 @@ typedef long celt;                          /* type to hold chr, MCCE number, or
 
 /*  RN - the "not use sizeof() thing is really annoying!" */
 #if wxUSE_UNICODE
 
 /*  RN - the "not use sizeof() thing is really annoying!" */
 #if wxUSE_UNICODE

-#      define CHRBITS 32
-#      define CHR_MAX 0xfffffffe               /* CHR_MAX-CHR_MIN+1 should fit in uchr */
-#else
-#      define CHRBITS 8                        /* bits in a chr; must not use sizeof */
-#      define CHR_MAX 0xfe
-#endif
+#   if defined(__WINDOWS__)
+#       define CHRBITS 16
+#       define CHR_MAX 0xfffe          
+#   else   /* !__WINDOWS__ */
+#       if defined(__MACH__)
+#           define CHRBITS 32
+#           define CHR_MAX 0xfffffffe          
+#       else  /* !__MACH__ */
+#           if !defined(SIZEOF_WCHAR_T)
+#               define CHRBITS 16
+#               define CHR_MAX 0xfffe          
+#           else       /* defined(SIZEOF_WCHAR_T) */
+#               define CHRBITS SIZEOF_WCHAR_T
+#               define CHR_MAX ((1 << CHRBITS) - 1)            
+#           endif  /* !defined(SIZEOF_WCHAR_T) */
+#       endif  /* defined(__MACH__)  */
+#   endif  /*  defined(__WINDOWS__)  */
+#else  /*  !wxUSE_UNICODE */
+#   define CHRBITS 8                   /* bits in a chr; must not use sizeof */
+#   define CHR_MAX 0xfe
+#endif  /* wxUSE_UNICODE  */
+

 #define CHR_MIN 0x00000000             /* smallest and largest chr; the value */
 /*     
        PUTTING PARENTHASES AROUND THIS, I.E. (1 << CHRBITS) WILL
        CAUSE ALL CHARACTERS TO BE MATCHED!!!
 */
 #define CHR_MIN 0x00000000             /* smallest and largest chr; the value */
 /*     
        PUTTING PARENTHASES AROUND THIS, I.E. (1 << CHRBITS) WILL
        CAUSE ALL CHARACTERS TO BE MATCHED!!!
 */

-/*#define CHR_MAX 1 << CHRBITS /*0xfffffffe*/          /* CHR_MAX-CHR_MIN+1 should fit in uchr */
+/*#define CHR_MAX 1 << CHRBITS /                CHR_MAX-CHR_MIN+1 should fit in uchr */

 
 
 /* functions operating on chr */
 
 
 /* functions operating on chr */