Don't assume that LC_MESSAGES is always available on WIN32. Per Magnus.

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 055082e65fdad54ba2b541511939727024e3bd11..91881cdbd9f26e5c7fcf1b1893f39cdb51851090 100644 (file)
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.33 2005/12/28 23:22:51 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.34 2006/01/02 20:25:45 tgl Exp $
  *
  *-----------------------------------------------------------------------
  */
@@ -106,15 +106,17 @@ pg_perm_setlocale(int category, const char *locale)
     * We must ignore attempts to set to "", which means "keep using the
     * old environment value".
     */
-   if (category != LC_MESSAGES)
-       result = setlocale(category, locale);
-   else
+#ifdef LC_MESSAGES
+   if (category == LC_MESSAGES)
    {
        result = (char *) locale;
        if (locale == NULL || locale[0] == '\0')
            return result;
    }
+   else
 #endif
+       result = setlocale(category, locale);
+#endif /* WIN32 */
 
    if (result == NULL)
        return result;          /* fall out immediately on failure */