*** pgsql/src/backend/utils/mb/mbutils.c	2009/03/08 16:07:12	1.80
--- pgsql/src/backend/utils/mb/mbutils.c	2009/03/08 18:10:16	1.81
***************
*** 4,10 ****
   * (currently mule internal code (mic) is used)
   * Tatsuo Ishii
   *
!  * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.79 2009/03/02 15:10:09 teodor Exp $
   */
  #include "postgres.h"
  
--- 4,10 ----
   * (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 $
   */
  #include "postgres.h"
  
*************** SetDatabaseEncoding(int encoding)
*** 891,907 ****
  	DatabaseEncoding = &pg_enc2name_tbl[encoding];
  	Assert(DatabaseEncoding->encoding == encoding);
  
  	pg_bind_textdomain_codeset(textdomain(NULL), encoding);
  }
  
  /*
   * On Windows, we need to explicitly bind gettext to the correct
   * encoding, because gettext() tends to get confused.
   */
  void
  pg_bind_textdomain_codeset(const char *domainname, int encoding)
  {
! #if defined(ENABLE_NLS) && defined(WIN32)
  	int     i;
  
  	for (i = 0; i < lengthof(codeset_map_array); i++)
--- 891,910 ----
  	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)
  {
! #ifdef WIN32
  	int     i;
  
  	for (i = 0; i < lengthof(codeset_map_array); i++)
*************** pg_bind_textdomain_codeset(const char *d
*** 916,921 ****
--- 919,925 ----
  	}
  #endif
  }
+ #endif
  
  void
  SetDefaultClientEncoding(void)