From a5e4b17a10be22e20d81252783094753ff0afda3 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Sat, 23 Nov 2024 09:14:48 +1300 Subject: [PATCH v2 2/3] Formally require ucrt on Windows. Historically we tolerated the absence of various C runtime library features for the benefit of the MinGW tool chain, because it used ancient msvcrt.dll for a long period of time. It now uses ucrt by default (like Windows 10+, Visual Studio 2015+), and that's the only configuration we're testing. In practice, we effectively required ucrt already in PostgreSQL 17, when commit 8d9a9f03 required _create_locale etc, first available in msvcr120.dll (Visual Studio 2013, the last of the pre-ucrt series of runtimes), and for MinGW users that practically meant ucrt because it was difficult or impossible to use msvcr120.dll. That may even not have been the first such case, but old MinGW configurations had already dropped off our testing radar so we weren't paying much attention. This commit formalizes the requirement. It also removes a couple of obsolete comments that discussed msvcrt.dll limitations, and some tests of !defined(_MSC_VER) to imply msvcrt.dll. There are many more anachronisms, but it'll take some time to figure out how to remove them all. XXX Help needed to rewrite doc/src/sgml/installation.sgml, to clarify that we now only support https://en.wikipedia.org/wiki/Mingw-w64 and MSYS2, not https://en.wikipedia.org/wiki/MinGW and MSYS (no one is testing the latter, and it probably can't build PostgreSQL 17, since it can't use UCRT?) Reviewed-by: Peter Eisentraut Discussion: https://postgr.es/m/d9e7731c-ca1b-477c-9298-fa51e135574a%40eisentraut.org --- src/backend/utils/adt/pg_locale.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index d4e89663ec..d1b392c248 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -1017,13 +1017,6 @@ cache_locale_time(void) * get ISO Locale name directly by using GetLocaleInfoEx() with LCType as * LOCALE_SNAME. * - * MinGW headers declare _create_locale(), but msvcrt.dll lacks that symbol in - * releases before Windows 8. IsoLocaleName() always fails in a MinGW-built - * postgres.exe, so only Unix-style values of the lc_messages GUC can elicit - * localized messages. In particular, every lc_messages setting that initdb - * can select automatically will yield only C-locale messages. XXX This could - * be fixed by running the fully-qualified locale name through a lookup table. - * * This function returns a pointer to a static buffer bearing the converted * name or NULL if conversion fails. * @@ -1031,8 +1024,6 @@ cache_locale_time(void) * [2] https://docs.microsoft.com/en-us/windows/win32/intl/locale-names */ -#if defined(_MSC_VER) - /* * Callback function for EnumSystemLocalesEx() in get_iso_localename(). * @@ -1201,16 +1192,6 @@ IsoLocaleName(const char *winlocname) return get_iso_localename(winlocname); } -#else /* !defined(_MSC_VER) */ - -static char * -IsoLocaleName(const char *winlocname) -{ - return NULL; /* Not supported on MinGW */ -} - -#endif /* defined(_MSC_VER) */ - #endif /* WIN32 && LC_MESSAGES */ -- 2.47.0