File tree 2 files changed +3
-7
lines changed
2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change 4
4
* (currently mule internal code (mic) is used)
5
5
* Tatsuo Ishii
6
6
*
7
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.81 2009/03/08 18:10:16 alvherre Exp $
7
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.82 2009/03/09 00:01:32 alvherre Exp $
8
8
*/
9
9
#include "postgres.h"
10
10
@@ -900,11 +900,10 @@ SetDatabaseEncoding(int encoding)
900
900
* On Windows, we need to explicitly bind gettext to the correct
901
901
* encoding, because gettext() tends to get confused.
902
902
*/
903
- #ifdef ENABLE_NLS
904
903
void
905
904
pg_bind_textdomain_codeset (const char * domainname , int encoding )
906
905
{
907
- #ifdef WIN32
906
+ #if defined( ENABLE_NLS ) && defined( WIN32 )
908
907
int i ;
909
908
910
909
for (i = 0 ; i < lengthof (codeset_map_array ); i ++ )
@@ -919,7 +918,6 @@ pg_bind_textdomain_codeset(const char *domainname, int encoding)
919
918
}
920
919
#endif
921
920
}
922
- #endif
923
921
924
922
void
925
923
SetDefaultClientEncoding (void )
Original file line number Diff line number Diff line change 6
6
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
7
7
* Portions Copyright (c) 1994, Regents of the University of California
8
8
*
9
- * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.86 2009/03/08 18:10:17 alvherre Exp $
9
+ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.87 2009/03/09 00:01:32 alvherre Exp $
10
10
*
11
11
* NOTES
12
12
* 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);
392
392
extern void SetDatabaseEncoding (int encoding );
393
393
extern int GetDatabaseEncoding (void );
394
394
extern const char * GetDatabaseEncodingName (void );
395
- #ifdef ENABLE_NLS
396
395
extern void pg_bind_textdomain_codeset (const char * domainname , int encoding );
397
- #endif
398
396
399
397
extern int pg_valid_client_encoding (const char * name );
400
398
extern int pg_valid_server_encoding (const char * name );
You can’t perform that action at this time.
0 commit comments