diff options
| author | Marc G. Fournier | 1998-07-26 04:31:41 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1998-07-26 04:31:41 +0000 |
| commit | 5979d7384179a41390c1ed122c6cc60d30287e2a (patch) | |
| tree | 5c45522ec5301eefd17f5439c216f9e628b60d3f /src/backend/regex | |
| parent | 74b30a3a1f96eb58e7cca0a92fb00bce7e825fbe (diff) | |
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).
Diffstat (limited to 'src/backend/regex')
| -rw-r--r-- | src/backend/regex/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/regex/engine.c | 15 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 1d1a9ac4f68..88d81f60ab3 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,7 +4,7 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.7 1998/07/24 03:31:24 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.8 1998/07/26 04:30:34 scrappy Exp $ # #------------------------------------------------------------------------- @@ -15,8 +15,8 @@ CFLAGS += -I.. CFLAGS += -DPOSIX_MISTAKE OBJS = regcomp.o regerror.o regexec.o regfree.o -ifdef MB -CFLAGS += -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif all: SUBSYS.o 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) |