1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-21 00:42:43 +03:00

pg_bind_textdomain_codeset must exist only on ENABLE_NLS.

This commit is contained in:
Alvaro Herrera
2009-03-08 18:10:17 +00:00
parent fb2ebae498
commit 4022f94c24
2 changed files with 9 additions and 3 deletions

View File

@@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.80 2009/03/08 16:07:12 alvherre Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.81 2009/03/08 18:10:16 alvherre Exp $
*/
#include "postgres.h"
@@ -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)