diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
| commit | 5979d7384179a41390c1ed122c6cc60d30287e2a (patch) | |
| tree | 5c45522ec5301eefd17f5439c216f9e628b60d3f /src/backend/utils/cache | |
| parent | 74b30a3a1f96eb58e7cca0a92fb00bce7e825fbe (diff) | |
| download | postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.tar.gz postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.zip | |
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/utils/cache')
| -rw-r--r-- | src/backend/utils/cache/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/utils/cache/fcache.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index 78eed2b19b9..ada76622cd9 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.7 1998/07/24 03:31:46 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.8 1998/07/26 04:30:54 scrappy Exp $ # #------------------------------------------------------------------------- @@ -12,8 +12,8 @@ SRCDIR = ../../.. include ../../../Makefile.global CFLAGS += -I../.. -ifdef MB -CFLAGS += -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o fcache.o diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c index 28af48dc904..1a10eaedb4b 100644 --- a/src/backend/utils/cache/fcache.c +++ b/src/backend/utils/cache/fcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.13 1998/07/24 03:31:46 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.14 1998/07/26 04:30:55 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ #include "catalog/pg_type.h" #include "catalog/pg_proc.h" #include "catalog/pg_language.h" -#ifdef MB +#ifdef MULTIBYTE #include "catalog/pg_class_mb.h" #else #include "catalog/pg_class.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 1f97949d303..704941b51d2 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.42 1998/07/24 03:31:47 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.43 1998/07/26 04:30:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ #include "catalog/indexing.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_attrdef.h" -#ifdef MB +#ifdef MULTIBYTE #include "catalog/pg_attribute_mb.h" #else #include "catalog/pg_attribute.h" |