From c3b939b99803aa2b7074556b8a8afe4c6852f4f7 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Tue, 27 Jan 2009 12:45:09 +0000 Subject: [PATCH] Silence compiler warnings in new win32 locale code when building on mingw. ITAGAKI Takahiro --- src/backend/utils/adt/pg_locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index adb3725f87..7ee280834d 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -92,7 +92,7 @@ static char lc_monetary_envbuf[LC_ENV_BUFSIZE]; static char lc_numeric_envbuf[LC_ENV_BUFSIZE]; static char lc_time_envbuf[LC_ENV_BUFSIZE]; -#ifdef WIN32 +#if defined(WIN32) && defined(LC_MESSAGES) static char *IsoLocaleName(const char *); /* MSVC specific */ #endif @@ -158,7 +158,7 @@ pg_perm_setlocale(int category, const char *locale) #ifdef WIN32 result = IsoLocaleName(locale); if (result == NULL) - result = locale; + result = (char *) locale; #endif /* WIN32 */ break; #endif /* LC_MESSAGES */ @@ -601,7 +601,7 @@ cache_locale_time(void) } -#ifdef WIN32 +#if defined(WIN32) && defined(LC_MESSAGES) /* * Convert Windows locale name to the ISO formatted one * if possible. @@ -647,5 +647,5 @@ char *IsoLocaleName(const char *winlocname) return NULL; /* Not supported on this version of msvc/mingw */ #endif /* _MSC_VER >= 1400 */ } -#endif /* WIN32 */ +#endif /* WIN32 && LC_MESSAGES */ -- 2.39.5