Fix for multi-byte includes.

bmomjian · bmomjian · commit 33e826d1675c · 1999-07-17T16:25:28.000Z
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.52 1999/07/16 05:00:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.53 1999/07/17 16:25:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,10 @@
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 
+#ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
+#endif
+
 #ifdef CYR_RECODE
 char	   *convertstr(char *, int, int);
 #endif
diff --git 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.46 1999/07/16 17:46:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.47 1999/07/17 16:25:25 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -50,6 +50,10 @@
 #include "utils/syscache.h"
 #include "version.h"
 
+#ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
+#endif
+
 static void VerifySystemDatabase(void);
 static void VerifyMyDatabase(void);
 static void InitCommunication(void);
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
@@ -3,11 +3,13 @@
  * client encoding and server internal encoding.
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
- * $Id: mbutils.c,v 1.6 1999/05/25 16:12:43 momjian Exp $ */
+ * $Id: mbutils.c,v 1.7 1999/07/17 16:25:26 momjian Exp $ */
 
 #include <stdio.h>
 #include <string.h>
 
+#include "postgres.h"
+#include "miscadmin.h"
 #include "mb/pg_wchar.h"
 
 static int	client_encoding = -1;
diff --git a/src/backend/utils/mb/variable.c b/src/backend/utils/mb/variable.c
@@ -2,9 +2,10 @@
  * This file contains some public functions
  * related to show/set/reset variable commands.
  * Tatsuo Ishii
- * $Id: variable.c,v 1.4 1999/05/25 16:12:44 momjian Exp $
+ * $Id: variable.c,v 1.5 1999/07/17 16:25:27 momjian Exp $
  */
 
+#include "postgres.h"
 #include "mb/pg_wchar.h"
 
 bool
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
@@ -1,9 +1,10 @@
-/* $Id: pg_wchar.h,v 1.10 1999/07/14 01:20:20 momjian Exp $ */
+/* $Id: pg_wchar.h,v 1.11 1999/07/17 16:25:28 momjian Exp $ */
 
 #ifndef PG_WCHAR_H
 #define PG_WCHAR_H
 
 #include <sys/types.h>
+#include "c.h"
 
 #define SQL_ASCII 0				/* SQL/ASCII */
 #define EUC_JP 1				/* EUC for Japanese */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.52 1999/07/16 05:00:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.53 1999/07/17 16:25:25 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -19,6 +19,10 @@`
`19`	`19`	`#include "catalog/pg_type.h"`
`20`	`20`	`#include "utils/builtins.h"`
`21`	`21`
	`22`	`+#ifdef MULTIBYTE`
	`23`	`+#include "mb/pg_wchar.h"`
	`24`	`+#endif`
	`25`	`+`
`22`	`26`	`#ifdef CYR_RECODE`
`23`	`27`	`char convertstr(char , int, int);`
`24`	`28`	`#endif`