Commit4022f94

committed

pg_bind_textdomain_codeset must exist only on ENABLE_NLS.

1 parentfb2ebae commit4022f94Copy full SHA for 4022f94

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.80 2009/03/0816:07:12 alvherre Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.81 2009/03/0818:10:16 alvherre Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include"postgres.h"`
`10`	`10`
`@@ -891,17 +891,20 @@ SetDatabaseEncoding(int encoding)`
`891`	`891`	`DatabaseEncoding=&pg_enc2name_tbl[encoding];`
`892`	`892`	`Assert(DatabaseEncoding->encoding==encoding);`
`893`	`893`
	`894`	`+#ifdefENABLE_NLS`
`894`	`895`	`pg_bind_textdomain_codeset(textdomain(NULL),encoding);`
	`896`	`+#endif`
`895`	`897`	`}`
`896`	`898`
`897`	`899`	`/*`
`898`	`900`	`* On Windows, we need to explicitly bind gettext to the correct`
`899`	`901`	`* encoding, because gettext() tends to get confused.`
`900`	`902`	`*/`
	`903`	`+#ifdefENABLE_NLS`
`901`	`904`	`void`
`902`	`905`	`pg_bind_textdomain_codeset(constchar*domainname,intencoding)`
`903`	`906`	`{`
`904`		`-#if defined(ENABLE_NLS)&& defined(WIN32)`
	`907`	`+#ifdefWIN32`
`905`	`908`	`inti;`
`906`	`909`
`907`	`910`	`for (i=0;i<lengthof(codeset_map_array);i++)`
`@@ -916,6 +919,7 @@ pg_bind_textdomain_codeset(const char *domainname, int encoding)`
`916`	`919`	`}`
`917`	`920`	`#endif`
`918`	`921`	`}`
	`922`	`+#endif`
`919`	`923`
`920`	`924`	`void`
`921`	`925`	`SetDefaultClientEncoding(void)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.85 2009/03/0816:07:12 alvherre Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.86 2009/03/0818:10:17 alvherre Exp $`
`10`	`10`	`*`
`11`	`11`	`*NOTES`
`12`	`12`	`*This is used both by the backend and by libpq, but should not be`
`@@ -392,7 +392,9 @@ extern const char *pg_get_client_encoding_name(void);`
`392`	`392`	`externvoidSetDatabaseEncoding(intencoding);`
`393`	`393`	`externintGetDatabaseEncoding(void);`
`394`	`394`	`externconstchar*GetDatabaseEncodingName(void);`
	`395`	`+#ifdefENABLE_NLS`
`395`	`396`	`externvoidpg_bind_textdomain_codeset(constchar*domainname,intencoding);`
	`397`	`+#endif`
`396`	`398`
`397`	`399`	`externintpg_valid_client_encoding(constchar*name);`
`398`	`400`	`externintpg_valid_server_encoding(constchar*name);`

Comments

(0)