From 5979d7384179a41390c1ed122c6cc60d30287e2a Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sun, 26 Jul 1998 04:31:41 +0000 Subject: From: t-ishii@sra.co.jp As Bruce mentioned, this is due to the conflict among changes we made. Included patches should fix the problem(I changed all MB to MULTIBYTE). Please let me know if you have further problem. P.S. I did not include pathces to configure and gram.c to save the file size(configure.in and gram.y modified). --- src/backend/regex/engine.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/backend/regex/engine.c') diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c index 43988b6dbd8..4c51fa5addc 100644 --- a/src/backend/regex/engine.c +++ b/src/backend/regex/engine.c @@ -118,19 +118,8 @@ extern "C" #define CODEMAX (BOL+5) /* highest code used */ #ifdef MULTIBYTE -# if MULTIBYTE == MULE_INTERNAL -# define NONCHAR(c) ((c) > 16777216) /* 16777216 == 2^24 == 3 bytes */ -# define NNONCHAR (CODEMAX-16777216) -# elif MULTIBYTE == EUC_JP || MULTIBYTE == EUC_CN || MULTIBYTE == EUC_KR || MULTIBYTE == EUC_TW -# define NONCHAR(c) ((c) > USHRT_MAX) -# define NNONCHAR (CODEMAX-USHRT_MAX) -# elif MULTIBYTE == UNICODE -# define NONCHAR(c) ((c) > USHRT_MAX) -# define NNONCHAR (CODEMAX-USHRT_MAX) -# else /* assume 1 byte code such as ISO8859-1 */ -# define NONCHAR(c) ((c) > UCHAR_MAX) -# define NNONCHAR (CODEMAX-UCHAR_MAX) -# endif +# define NONCHAR(c) ((c) > 16777216) /* 16777216 == 2^24 == 3 bytes */ +# define NNONCHAR (CODEMAX-16777216) #else # define NONCHAR(c) ((c) > CHAR_MAX) # define NNONCHAR (CODEMAX-CHAR_MAX) -- cgit v1.2.3