Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set CHRBITS to the "correct" amount.

Browse Source 
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
This commit is contained in:
Ryan Norton
2003-12-14 22:18:37 +00:00
parent 48c15d381c
commit 80e10e8b74
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/regex/regcustom.h
View File

@@ -60,8 +60,8 @@
/* internal character type and related */ /* internal character type and related */
typedef wx_wchar chr; /* the type itself */ typedef wx_wchar chr; /* the type itself */
typedef wx_wchar uchr; /* unsigned type that will hold a chr */ typedef unsigned long uchr; /* unsigned type that will hold a chr */
typedef wx_wchar celt; /* type to hold chr, MCCE number, or typedef long celt; /* type to hold chr, MCCE number, or
* NOCELT */ * NOCELT */
#define NOCELT (-1) /* celt value which is not valid chr or #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 #define CHR(c) ((unsigned char) (c)) /* turn char literal into chr
* literal */ * literal */
#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */ #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_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 */ /* functions operating on chr */
#define iscalnum(x) wx_isalnum(x) #define iscalnum(x) wx_isalnum(x)