pg_bind_textdomain_codeset must exist only on ENABLE_NLS.

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index e8b1d7c94c3590f5d73a828c5fadbeb96e1d9542..bcc9a7d677a7e57a4d4e7efc5fe130c5410b30d7 100644 (file)
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -891,17 +891,20 @@ SetDatabaseEncoding(int encoding)
        DatabaseEncoding = &pg_enc2name_tbl[encoding];
        Assert(DatabaseEncoding->encoding == encoding);
 
+#ifdef ENABLE_NLS
        pg_bind_textdomain_codeset(textdomain(NULL), encoding);
+#endif
 }
 
 /*
  * 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)
 {
-#if defined(ENABLE_NLS) && defined(WIN32)
+#ifdef WIN32
        int     i;
 
        for (i = 0; i < lengthof(codeset_map_array); i++)
@@ -916,6 +919,7 @@ 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 76322c9e3602511c8cf1fce3775e6d9dd08f3226..c08c8a3e66340341707a9ceb0c1ab6ff74c42c13 100644 (file)
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -392,7 +392,9 @@ 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);