diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 13 | ||||
| -rw-r--r-- | src/include/port/win32_port.h | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 40a68b9b2c2..aa9da99308a 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -154,36 +154,41 @@ static void icu_set_collation_attributes(UCollator *collator, const char *loc, UErrorCode *status); #endif -#ifndef WIN32 /* * POSIX doesn't define _l-variants of these functions, but several systems - * have them. We provide our own replacements here. For Windows, we have - * macros in win32_port.h. + * have them. We provide our own replacements here. */ #ifndef HAVE_MBSTOWCS_L static size_t mbstowcs_l(wchar_t *dest, const char *src, size_t n, locale_t loc) { +#ifdef WIN32 + return _mbstowcs_l(dest, src, n, loc); +#else size_t result; locale_t save_locale = uselocale(loc); result = mbstowcs(dest, src, n); uselocale(save_locale); return result; +#endif } #endif #ifndef HAVE_WCSTOMBS_L static size_t wcstombs_l(char *dest, const wchar_t *src, size_t n, locale_t loc) { +#ifdef WIN32 + return _wcstombs_l(dest, src, n, loc); +#else size_t result; locale_t save_locale = uselocale(loc); result = wcstombs(dest, src, n); uselocale(save_locale); return result; -} #endif +} #endif /* diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h index b957d5c5981..0e6d6083308 100644 --- a/src/include/port/win32_port.h +++ b/src/include/port/win32_port.h @@ -455,8 +455,6 @@ extern int _pglstat64(const char *name, struct stat *buf); #define strcoll_l _strcoll_l #define strxfrm_l _strxfrm_l #define wcscoll_l _wcscoll_l -#define wcstombs_l _wcstombs_l -#define mbstowcs_l _mbstowcs_l /* * Versions of libintl >= 0.18? try to replace setlocale() with a macro |