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/storage | |
| parent | 74b30a3a1f96eb58e7cca0a92fb00bce7e825fbe (diff) | |
| download | postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.tar.gz | |
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/storage')
| -rw-r--r-- | src/backend/storage/lmgr/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/smgr/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/storage/smgr/md.c | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 5c7ee26afa..66fc25484a 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.7 1998/07/24 03:31:32 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.8 1998/07/26 04:30:40 scrappy Exp $ # #------------------------------------------------------------------------- @@ -12,8 +12,8 @@ SRCDIR = ../../.. include ../../../Makefile.global CFLAGS += -I../.. -ifdef MB -CFLAGS += -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif OBJS = lmgr.o lock.o multi.o proc.o single.o diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index a2633744e9..5cea3b2e1f 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.14 1998/07/24 03:31:33 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.15 1998/07/26 04:30:41 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ #include "catalog/catname.h" #include "catalog/catalog.h" -#ifdef MB +#ifdef MULTIBYTE #include "catalog/pg_class_mb.h" #else #include "catalog/pg_class.h" diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 95784123fb..78da3053ef 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.7 1998/07/24 03:31:35 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.8 1998/07/26 04:30:43 scrappy Exp $ # #------------------------------------------------------------------------- @@ -13,8 +13,8 @@ include ../../../Makefile.global CFLAGS += -I../.. -ifdef MB -CFLAGS += -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif OBJS = md.o mm.o smgr.o smgrtype.o diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 850b8df96a..91b45033cf 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.34 1998/07/24 03:31:35 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.35 1998/07/26 04:30:44 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -568,11 +568,11 @@ mdblindwrt(char *dbstr, Oid owner, id; char *tmpPath; -#ifdef MB +#ifdef MULTIBYTE int tmpEncoding; #endif -#ifdef MB +#ifdef MULTIBYTE GetRawDatabaseInfo(dbstr, &owner, &id, dbpath, &tmpEncoding); #else GetRawDatabaseInfo(dbstr, &owner, &id, dbpath); @@ -614,11 +614,11 @@ mdblindwrt(char *dbstr, id; char *tmpPath; -#ifdef MB +#ifdef MULTIBYTE int tmpEncoding; #endif -#ifdef MB +#ifdef MULTIBYTE GetRawDatabaseInfo(dbstr, &owner, &id, dbpath, &tmpEncoding); #else GetRawDatabaseInfo(dbstr, &owner, &id, dbpath); |