Commite43fd89

committed

Revert pg_bind_textdomain_codeset to a existant-but-empty function when

ENABLE_NLS is not defined, for better compatibility of the backend withmodules compiled the other way.Per note from Tom after my previous commit.

1 parentace2b06 commite43fd89Copy full SHA for e43fd89

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 4 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.81 2009/03/08 18:10:16 alvherre Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.82 2009/03/09 00:01:32 alvherre Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include"postgres.h"`
`10`	`10`
`@@ -900,11 +900,10 @@ SetDatabaseEncoding(int encoding)`
`900`	`900`	`* On Windows, we need to explicitly bind gettext to the correct`
`901`	`901`	`* encoding, because gettext() tends to get confused.`
`902`	`902`	`*/`
`903`		`-#ifdefENABLE_NLS`
`904`	`903`	`void`
`905`	`904`	`pg_bind_textdomain_codeset(constchar*domainname,intencoding)`
`906`	`905`	`{`
`907`		`-#ifdefWIN32`
	`906`	`+#if defined(ENABLE_NLS)&& defined(WIN32)`
`908`	`907`	`inti;`
`909`	`908`
`910`	`909`	`for (i=0;i<lengthof(codeset_map_array);i++)`
`@@ -919,7 +918,6 @@ pg_bind_textdomain_codeset(const char *domainname, int encoding)`
`919`	`918`	`}`
`920`	`919`	`#endif`
`921`	`920`	`}`
`922`		`-#endif`
`923`	`921`
`924`	`922`	`void`
`925`	`923`	`SetDefaultClientEncoding(void)`

Lines changed: 1 addition & 3 deletions

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.86 2009/03/08 18:10:17 alvherre Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.87 2009/03/09 00:01:32 alvherre Exp $`
`10`	`10`	`*`
`11`	`11`	`*NOTES`
`12`	`12`	`*This is used both by the backend and by libpq, but should not be`
`@@ -392,9 +392,7 @@ 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`
`396`	`395`	`externvoidpg_bind_textdomain_codeset(constchar*domainname,intencoding);`
`397`		`-#endif`
`398`	`396`
`399`	`397`	`externintpg_valid_client_encoding(constchar*name);`
`400`	`398`	`externintpg_valid_server_encoding(constchar*name);`

Comments

(0)