+2024-06-03 Paul Eggert <eggert@cs.ucla.edu>
+
+ nstrftime: remove dependency on hard-locale
+ GNU Emacs would rather keep dependencies to a minimum,
+ and hard-locale brings in some other stuff.
+ * lib/strftime.c: Include locale.h only if (USE_C_LOCALE &&
+ HAVE_STRFTIME_L) || ((defined __NetBSD__ || defined __sun) &&
+ REQUIRE_GNUISH_STRFTIME_AM_PM). Do not include hard-locale.h.
+ (libc_hidden_def): On native MS-Windows, use the C locale %c
+ format regardless of language. I hope that’s good enough.
+ If not, let’s try to think of a way of solving the problem
+ that doesn’t require using hard_locale.
+ * modules/nstrftime (Depends-on): Remove hard-locale.
+ * modules/nstrftime-tests (test_nstrftime_LDADD):
+ Remove $(HARD_LOCALE_LIB).
+ * tests/test-nstrftime.h (locales_test):
+ Add a test that I hope works on French MS-Windows.
+
2024-06-03 Paul Eggert <eggert@cs.ucla.edu>
ieee754-h: port to Android NDK r26
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
+#if USE_C_LOCALE && HAVE_STRFTIME_L
+# include <locale.h>
+#endif
+
#if (defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM
+# include <locale.h>
# include "localename.h"
#endif
-#if !USE_C_LOCALE
-# include "hard-locale.h"
-#endif
#include "attribute.h"
#include <intprops.h>
subfmt = L_("%a %b %e %H:%M:%S %Y");
#elif defined _WIN32 && !defined __CYGWIN__
/* On native Windows, "%c" is "%d/%m/%Y %H:%M:%S" by default. */
- if (hard_locale (LC_TIME))
- subfmt = L_("%a %e %b %Y %H:%M:%S");
- else
- subfmt = L_("%a %b %e %H:%M:%S %Y");
+ subfmt = L_("%a %b %e %H:%M:%S %Y");
#else
goto underlying_strftime;
#endif
errno
extensions
intprops
-hard-locale
libc-config
localename-unsafe-limited
stdbool
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-nstrftime
-test_nstrftime_LDADD = $(LDADD) $(SETLOCALE_LIB) $(HARD_LOCALE_LIB)
+test_nstrftime_LDADD = $(LDADD) $(SETLOCALE_LIB)
ASSERT (STREQ (buf, "jeu. 26 oct. 2017 06:40:03") /* glibc, Cygwin */
|| STREQ (buf, "jeu. 26 oct. 06:40:03 2017") /* FreeBSD */
|| STREQ (buf, "Jeu 26 oct 06:40:03 2017") /* macOS, older FreeBSD */
+ || STREQ (buf, "Jeu oct. 26 06:40:03 2017") /* MS-Windows */
|| STREQ (buf, "26 octobre 2017 06:40:03") /* NetBSD */
|| STREQ (buf, "26 octobre 2017 à 06:40:03") /* Solaris (UTF-8) */
|| STREQ (buf, "26 octobre 2017 \340 06:40:03") /* Solaris (ISO-8859-1) */);