diff options
Diffstat (limited to 'src/backend/utils/init/postinit.c')
-rw-r--r-- | src/backend/utils/init/postinit.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 12d1255b9ba..790684cda13 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.33 1998/08/11 18:28:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.34 1998/08/24 01:13:56 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -67,10 +67,7 @@ #include "catalog/catname.h" #ifdef MULTIBYTE -#include "catalog/pg_database_mb.h" #include "mb/pg_wchar.h" -#else -#include "catalog/pg_database.h" #endif #include "libpq/libpq.h" @@ -83,11 +80,7 @@ static void InitStdio(void); static void InitUserid(void); extern char *ExpandDatabasePath(char *name); -#ifdef MULTIBYTE extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encoding); -#else -extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path); -#endif static IPCKey PostgresIpcKey; @@ -128,16 +121,10 @@ InitMyDatabaseInfo(char *name) int4 owner; char *path, myPath[MAXPGPATH + 1]; -#ifdef MULTIBYTE int encoding; -#endif SetDatabaseName(name); -#ifdef MULTIBYTE GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath, &encoding); -#else - GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath); -#endif if (!OidIsValid(MyDatabaseId)) elog(FATAL, |