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.

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index bcc9a7d677a7e57a4d4e7efc5fe130c5410b30d7..bf663211348b493b162b28501ba8e81fa61810c9 100644 (file)
--- 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 c08c8a3e66340341707a9ceb0c1ab6ff74c42c13..76322c9e3602511c8cf1fce3775e6d9dd08f3226 100644 (file)
--- 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);