diff options
| author | Alvaro Herrera | 2009-03-09 00:01:32 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2009-03-09 00:01:32 +0000 |
| commit | 3e90e50d925d9231997e89d6cddaf4f23eedde63 (patch) | |
| tree | 50af881a5975446f8d68978327f97697b19cdec2 | |
| parent | b4fa1062c084b6ed1e79de33c9bb9b95a0ea5e71 (diff) | |
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.
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 4 | ||||
| -rw-r--r-- | src/include/mb/pg_wchar.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index bcc9a7d677..bf66321134 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -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 c08c8a3e66..76322c9e36 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -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); |