Skip to content

Commit 5979d73

Browse files
scrappyscrappy
committed
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).
1 parent 74b30a3 commit 5979d73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+641
-254
lines changed

‎src/Makefile.global.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.44 1998/07/24 03:31:04 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.45 1998/07/26 04:30:15 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -151,7 +151,10 @@ X11_LIBS= -lX11 @X_EXTRA_LIBS@
151151
# enable multi-byte support
152152
# choose one of:
153153
# EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5
154-
MB=@MB@
154+
MULTIBYTE=@MULTIBYTE@
155+
ifdef MULTIBYTE
156+
MBFLAGS = -DMULTIBYTE=$(MULTIBYTE)
157+
endif
155158

156159
##############################################################################
157160
#

‎src/backend/access/common/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.11 1998/06/16 07:29:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.12 1998/07/26 04:30:16 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,8 +13,8 @@ include ../../../Makefile.global
1313

1414
CFLAGS+=-I../..
1515

16-
ifdef MB
17-
CFLAGS+= -DMB=$(MB)
16+
ifdef MULTIBYTE
17+
CFLAGS+= $(MBFLAGS)
1818
endif
1919

2020
OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \

‎src/backend/access/common/printtup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.30 1998/07/18 18:34:01 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.31 1998/07/26 04:30:16 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,7 +24,7 @@
2424
#include <utils/syscache.h>
2525

2626
#ifdef MULTIBYTE
27-
#include <commands/variable.h>
27+
#include <mb/pg_wchar.h>
2828
#endif
2929

3030
/* ----------------------------------------------------------------

‎src/backend/bootstrap/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.14 1998/07/24 03:31:06 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.15 1998/07/26 04:30:17 scrappy Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -22,8 +22,8 @@ SRCDIR= ../..
2222
include ../../Makefile.global
2323

2424
CFLAGS += -I..
25-
ifdef MB
26-
CFLAGS += -DMB=$(MB)
25+
ifdef MULTIBYTE
26+
CFLAGS+= $(MBFLAGS)
2727
endif
2828

2929
ifeq ($(CC), gcc)

‎src/backend/bootstrap/bootparse.y

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.17 1998/07/24 03:31:07 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.18 1998/07/26 04:30:18 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -31,7 +31,7 @@
3131
#include "bootstrap/bootstrap.h"
3232
#include "catalog/heap.h"
3333
#include "catalog/pg_am.h"
34-
#ifdef MB
34+
#ifdef MULTIBYTE
3535
#include "catalog/pg_attribute_mb.h"
3636
#include "catalog/pg_class_mb.h"
3737
#else

‎src/backend/bootstrap/bootscanner.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.9 1998/07/24 03:31:08 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.10 1998/07/26 04:30:19 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -20,7 +20,7 @@
2020
#include "storage/block.h"
2121
#include "storage/off.h"
2222
#include "storage/itemptr.h"
23-
#ifdef MB
23+
#ifdef MULTIBYTE
2424
#include "catalog/pg_attribute_mb.h"
2525
#else
2626
#include "catalog/pg_attribute.h"
@@ -32,7 +32,7 @@
3232
#include "access/funcindex.h"
3333
#include "storage/fd.h"
3434
#include "catalog/pg_am.h"
35-
#ifdef MB
35+
#ifdef MULTIBYTE
3636
#include "catalog/pg_class_mb.h"
3737
#else
3838
#include "catalog/pg_class.h"

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.45 1998/07/24 03:31:08 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.46 1998/07/26 04:30:19 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -41,7 +41,7 @@
4141
#include "catalog/catname.h"
4242
#include "catalog/index.h"
4343
#include "catalog/pg_am.h"
44-
#ifdef MB
44+
#ifdef MULTIBYTE
4545
#include "catalog/pg_attribute_mb.h"
4646
#include "catalog/pg_class_mb.h"
4747
#else

‎src/backend/catalog/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.11 1998/07/24 03:31:09 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.12 1998/07/26 04:30:20 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -24,7 +24,7 @@ SUBSYS.o: $(OBJS)
2424

2525
GENBKI= ./genbki.sh
2626

27-
ifdef MB
27+
ifdef MULTIBYTE
2828
GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
2929
pg_database_mb.h pg_variable.h pg_shadow.h \
3030
pg_group.h pg_log.h \
@@ -36,7 +36,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
3636
)
3737
endif
3838

39-
ifdef MB
39+
ifdef MULTIBYTE
4040
LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
4141
pg_proc.h pg_type.h pg_attribute_mb.h pg_class_mb.h \
4242
pg_inherits.h pg_index.h pg_version.h pg_statistic.h \

‎src/backend/commands/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.14 1998/07/24 03:31:11 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.15 1998/07/26 04:30:22 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,8 +13,8 @@ include ../../Makefile.global
1313

1414
CFLAGS += -I..
1515

16-
ifdef MB
17-
CFLAGS += -DMB=$(MB)
16+
ifdef MULTIBYTE
17+
CFLAGS+= $(MBFLAGS)
1818
endif
1919

2020
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \

‎src/backend/commands/cluster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.24 1998/07/24 03:31:13 scrappy Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.25 1998/07/26 04:30:22 scrappy Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -43,7 +43,7 @@
4343
#include <utils/excid.h>
4444
#include <utils/mcxt.h>
4545
#include <catalog/pg_proc.h>
46-
#ifdef MB
46+
#ifdef MULTIBYTE
4747
#include <catalog/pg_class_mb.h>
4848
#else
4949
#include <catalog/pg_class.h>

0 commit comments

Comments
 (0)