From e43fd89762a5a894ea04f4fe74e05f95a1488664 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 9 Mar 2009 00:01:32 +0000
Subject: [PATCH] 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.
---
src/backend/utils/mb/mbutils.c | 6 ++----
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 3a93bbd9a30..f54b7486cbf 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 37089e2cb0c..3f93d7bc128 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);
--
GitLab