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/access | |
| 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/access')
| -rw-r--r-- | src/backend/access/common/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/access/common/printtup.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 76974644fa6..5b188808e87 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,7 +4,7 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.11 1998/06/16 07:29:18 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.12 1998/07/26 04:30:16 scrappy Exp $ # #------------------------------------------------------------------------- @@ -13,8 +13,8 @@ include ../../../Makefile.global CFLAGS+=-I../.. -ifdef MB -CFLAGS+= -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \ diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c index 37a45b4cc6b..c07a2f9c978 100644 --- a/src/backend/access/common/printtup.c +++ b/src/backend/access/common/printtup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.30 1998/07/18 18:34:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.31 1998/07/26 04:30:16 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ #include <utils/syscache.h> #ifdef MULTIBYTE -#include <commands/variable.h> +#include <mb/pg_wchar.h> #endif /* ---------------------------------------------------------------- |