Commit33e826d

committed

Fix for multi-byte includes.

1 parentdf454bd commit33e826dCopy full SHA for 33e826d

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 5 additions & 1 deletion

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`	`+#ifdefMULTIBYTE`
	`23`	`+#include"mb/pg_wchar.h"`
	`24`	`+#endif`
	`25`	`+`
`22`	`26`	`#ifdefCYR_RECODE`
`23`	`27`	`charconvertstr(char,int,int);`
`24`	`28`	`#endif`

Lines changed: 5 additions & 1 deletion

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/init/postinit.c,v 1.46 1999/07/16 17:46:32 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.47 1999/07/17 16:25:25 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*InitPostgres() is the function called from PostgresMain`
`@@ -50,6 +50,10 @@`
`50`	`50`	`#include"utils/syscache.h"`
`51`	`51`	`#include"version.h"`
`52`	`52`
	`53`	`+#ifdefMULTIBYTE`
	`54`	`+#include"mb/pg_wchar.h"`
	`55`	`+#endif`
	`56`	`+`
`53`	`57`	`staticvoidVerifySystemDatabase(void);`
`54`	`58`	`staticvoidVerifyMyDatabase(void);`
`55`	`59`	`staticvoidInitCommunication(void);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`* client encoding and server internal encoding.`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`		`- * $Id: mbutils.c,v 1.6 1999/05/25 16:12:43 momjian Exp $ */`
	`6`	`+ * $Id: mbutils.c,v 1.7 1999/07/17 16:25:26 momjian Exp $ */`
`7`	`7`
`8`	`8`	`#include<stdio.h>`
`9`	`9`	`#include<string.h>`
`10`	`10`
	`11`	`+#include"postgres.h"`
	`12`	`+#include"miscadmin.h"`
`11`	`13`	`#include"mb/pg_wchar.h"`
`12`	`14`
`13`	`15`	`staticintclient_encoding=-1;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`	`* This file contains some public functions`
`3`	`3`	`* related to show/set/reset variable commands.`
`4`	`4`	`* Tatsuo Ishii`
`5`		`- * $Id: variable.c,v 1.4 1999/05/25 16:12:44 momjian Exp $`
	`5`	`+ * $Id: variable.c,v 1.5 1999/07/17 16:25:27 momjian Exp $`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include"postgres.h"`
`8`	`9`	`#include"mb/pg_wchar.h"`
`9`	`10`
`10`	`11`	`bool`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-/* $Id: pg_wchar.h,v 1.10 1999/07/14 01:20:20 momjian Exp $ */`
	`1`	`+/* $Id: pg_wchar.h,v 1.11 1999/07/17 16:25:28 momjian Exp $ */`
`2`	`2`
`3`	`3`	`#ifndefPG_WCHAR_H`
`4`	`4`	`#definePG_WCHAR_H`
`5`	`5`
`6`	`6`	`#include<sys/types.h>`
	`7`	`+#include"c.h"`
`7`	`8`
`8`	`9`	`#defineSQL_ASCII 0/* SQL/ASCII */`
`9`	`10`	`#defineEUC_JP 1/* EUC for Japanese */`

Comments

(0)