diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2009-03-09 00:01:32 +0000 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2009-03-09 00:01:32 +0000 |
| commit | e43fd89762a5a894ea04f4fe74e05f95a1488664 (patch) | |
| tree | 18be430799f560f8878f83b18bfdfe07c3e3dc40 /src | |
| parent | ace2b067d5a3d3c987960b830c325c6299c40532 (diff) | |
| download | postgresql-e43fd89762a5a894ea04f4fe74e05f95a1488664.tar.gz | |
Revert pg_bind_textdomain_codeset to a existant-but-empty function when
ENABLE_NLS is not defined, for better compatibility of the backend with
modules compiled the other way.
Per note from Tom after my previous commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 6 | ||||
| -rw-r--r-- | src/include/mb/pg_wchar.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 3a93bbd9a3..f54b7486cb 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * (currently mule internal code (mic) is used) * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.81 2009/03/08 18:10:16 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.82 2009/03/09 00:01:32 alvherre Exp $ */ #include "postgres.h" @@ -900,11 +900,10 @@ SetDatabaseEncoding(int encoding) * On Windows, we need to explicitly bind gettext to the correct * encoding, because gettext() tends to get confused. */ -#ifdef ENABLE_NLS void pg_bind_textdomain_codeset(const char *domainname, int encoding) { -#ifdef WIN32 +#if defined(ENABLE_NLS) && defined(WIN32) int i; for (i = 0; i < lengthof(codeset_map_array); i++) @@ -919,7 +918,6 @@ pg_bind_textdomain_codeset(const char *domainname, int encoding) } #endif } -#endif void SetDefaultClientEncoding(void) diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 37089e2cb0..3f93d7bc12 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.86 2009/03/08 18:10:17 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.87 2009/03/09 00:01:32 alvherre Exp $ * * NOTES * 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); extern void SetDatabaseEncoding(int encoding); extern int GetDatabaseEncoding(void); extern const char *GetDatabaseEncodingName(void); -#ifdef ENABLE_NLS extern void pg_bind_textdomain_codeset(const char *domainname, int encoding); -#endif extern int pg_valid_client_encoding(const char *name); extern int pg_valid_server_encoding(const char *name); |