]> Savannah Git Hosting - gnulib.git/commitdiff
nstrftime: always include locale.h
authorPaul Eggert <eggert@re>
Thu, 27 Jun 2024 22:26:18 +0000 (23:26 +0100)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jun 2024 22:26:52 +0000 (23:26 +0100)
* lib/strftime.c: Include locale.h unconditionally, simplifying
the code.  Emacs is now open for this change, which we had wanted
to do earlier.

ChangeLog
lib/strftime.c

index f058aab66af7aef2ea74c213620457933903b44f..0d8471aefb037a24c9970b1b657357dd62d5f396 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-27  Paul Eggert  <eggert@re>
+
+       nstrftime: always include locale.h
+       * lib/strftime.c: Include locale.h unconditionally, simplifying
+       the code.  Emacs is now open for this change, which we had wanted
+       to do earlier.
+
 2024-06-27  Collin Funk  <collin.funk1@gmail.com>
 
        netdb: Simplify NI_MAXHOST and NI_MAXSERV definitions.
index e21a356e800b2db8466dcc921422559dc52a115b..9b1b27a1fc8673a92d20892aa8f0b1cda1302f26 100644 (file)
 #endif
 
 #include <limits.h>
+#include <locale.h>
 #include <stdckdint.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if (((defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM) \
-     || (defined _WIN32 && !defined __CYGWIN__) \
-     || (USE_C_LOCALE && HAVE_STRFTIME_L))
-# include <locale.h>
-#endif
-
 #if (defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM
 # include "localename.h"
 #elif defined _WIN32 && !defined __CYGWIN__