(Fixed?) CHRBITS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index ddc99fe722db1f799b950c6cf8f4e2ac1f9c7145..43aff31f7ab244b256cdde7a909dcd65c077349c 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -80,12 +80,28 @@ 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
+#      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
 #      define CHRBITS 8                        /* bits in a chr; must not use sizeof */
 #      define CHR_MAX 0xfe

-#endif
+#endif  /* wxUSE_UNICODE  */
+

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