From 80e10e8b7441a8c26502fdc780cae30c047de627 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sun, 14 Dec 2003 22:18:37 +0000 Subject: [PATCH] Set CHRBITS to the "correct" amount. Also some other spruce-ups. (sorry, don't know how to be more specific than this!) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/regex/regcustom.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h index 39ef3f4..f548692 100644 --- a/src/regex/regcustom.h +++ b/src/regex/regcustom.h @@ -60,8 +60,8 @@ /* internal character type and related */ typedef wx_wchar chr; /* the type itself */ -typedef wx_wchar uchr; /* unsigned type that will hold a chr */ -typedef wx_wchar celt; /* type to hold chr, MCCE number, or +typedef unsigned long uchr; /* unsigned type that will hold a chr */ +typedef long celt; /* type to hold chr, MCCE number, or * NOCELT */ #define NOCELT (-1) /* celt value which is not valid chr or @@ -69,9 +69,15 @@ typedef wx_wchar celt; /* type to hold chr, MCCE number, or #define CHR(c) ((unsigned char) (c)) /* turn char literal into chr * literal */ #define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */ -#define CHRBITS 16/*32*/ /* bits in a chr; must not use sizeof */ + +/* 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 CHR_MIN 0x00000000 /* smallest and largest chr; the value */ -#define CHR_MAX 1 << CHRBITS /*0xfffffffe*/ /* CHR_MAX-CHR_MIN+1 should fit in uchr */ +#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) -- 2.7.4