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/init/postinit.c | |
| 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/init/postinit.c')
| -rw-r--r-- | src/backend/utils/init/postinit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 57ce319e764..465b41509e4 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.31 1998/07/24 03:31:50 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.32 1998/07/26 04:31:01 scrappy Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -66,7 +66,7 @@ #include "utils/inval.h" #include "catalog/catname.h" -#ifdef MB +#ifdef MULTIBYTE #include "catalog/pg_database_mb.h" #include "mb/pg_wchar.h" #else @@ -83,7 +83,7 @@ static void InitStdio(void); static void InitUserid(void); extern char *ExpandDatabasePath(char *name); -#ifdef MB +#ifdef MULTIBYTE extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path, int *encoding); #else extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path); @@ -128,12 +128,12 @@ InitMyDatabaseInfo(char *name) Oid owner; char *path, myPath[MAXPGPATH + 1]; -#ifdef MB +#ifdef MULTIBYTE int encoding; #endif SetDatabaseName(name); -#ifdef MB +#ifdef MULTIBYTE GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath, &encoding); #else GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath); @@ -147,7 +147,7 @@ InitMyDatabaseInfo(char *name) path = ExpandDatabasePath(myPath); SetDatabasePath(path); -#ifdef MB +#ifdef MULTIBYTE SetDatabaseEncoding(encoding); #endif |