mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_bind_textdomain_codeset must exist only on ENABLE_NLS.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/mb/mbutils.c
View File

@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * 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" #include "postgres.h"
@ -891,17 +891,20 @@ SetDatabaseEncoding(int encoding)
DatabaseEncoding = &pg_enc2name_tbl[encoding]; DatabaseEncoding = &pg_enc2name_tbl[encoding];
Assert(DatabaseEncoding->encoding == encoding); Assert(DatabaseEncoding->encoding == encoding);
#ifdef ENABLE_NLS
pg_bind_textdomain_codeset(textdomain(NULL), encoding); pg_bind_textdomain_codeset(textdomain(NULL), encoding);
#endif
} }
/* /*
* On Windows, we need to explicitly bind gettext to the correct * On Windows, we need to explicitly bind gettext to the correct
* encoding, because gettext() tends to get confused. * encoding, because gettext() tends to get confused.
*/ */
#ifdef ENABLE_NLS
void void
pg_bind_textdomain_codeset(const char *domainname, int encoding) pg_bind_textdomain_codeset(const char *domainname, int encoding)
{ {
#if defined(ENABLE_NLS) && defined(WIN32) #ifdef WIN32
int i; int i;
for (i = 0; i < lengthof(codeset_map_array); 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
} }
#endif
void void
SetDefaultClientEncoding(void) SetDefaultClientEncoding(void)

4
src/include/mb/pg_wchar.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.85 2009/03/08 16:07:12 alvherre Exp $ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.86 2009/03/08 18:10:17 alvherre Exp $
* *
* NOTES * NOTES
* This is used both by the backend and by libpq, but should not be * This is used both by the backend and by libpq, but should not be
@ -392,7 +392,9 @@ extern const char *pg_get_client_encoding_name(void);
extern void SetDatabaseEncoding(int encoding); extern void SetDatabaseEncoding(int encoding);
extern int GetDatabaseEncoding(void); extern int GetDatabaseEncoding(void);
extern const char *GetDatabaseEncodingName(void); extern const char *GetDatabaseEncodingName(void);
#ifdef ENABLE_NLS
extern void pg_bind_textdomain_codeset(const char *domainname, int encoding); 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_client_encoding(const char *name);
extern int pg_valid_server_encoding(const char *name); extern int pg_valid_server_encoding(const char *name);