Do not worry about whether locale.h is includable

* src/emacs.c, src/lread.c, src/sysdep.c: Remove preconditions
from including locale.h.  It was standardized in C89, is universal
now, and some code already assumes it.

(cherry picked from commit d2b847d2911218380d1640dea81d6e72d4a7dc7c)

diff --git a/src/emacs.c b/src/emacs.c
index 74a46468933f3806f72bd69c8c08d4b8b607777f..56de9d8ba206a342477eafc81f49a49c68a1b32f 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
+#include <locale.h>
 #include <stdlib.h>
 
 #include <sys/file.h>
@@ -132,10 +133,6 @@ extern char etext;
 # endif
 #endif
 
-#ifdef HAVE_SETLOCALE
-#include <locale.h>
-#endif
-
 #if HAVE_WCHAR_H
 # include <wchar.h>
 #endif

diff --git a/src/lread.c b/src/lread.c
index 1bc5b0c993db70bb4b38bc881dd921f402c9f2ff..047a201eaaa76ea15af658ec3a6d7bd0475097f2 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <errno.h>
+#include <locale.h>
 #include <math.h>
 #include <stat-time.h>
 #include "lisp.h"
@@ -55,11 +56,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #endif
 
 #include <unistd.h>
-
-#ifdef HAVE_SETLOCALE
-#include <locale.h>
-#endif /* HAVE_SETLOCALE */
-
 #include <fcntl.h>
 
 #if !defined HAVE_ANDROID || defined ANDROID_STUBIFY   \

diff --git a/src/sysdep.c b/src/sysdep.c
index 07237885cb9d07cca226064249afe317a89ef633..9e4f3b211bb1354b72e4191aa9399d1ca1111b71 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -4551,9 +4551,7 @@ does the same thing as `current-time'.  */)
 # include <wchar.h>
 # include <wctype.h>
 
-# if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE
-#  include <locale.h>
-# endif
+# include <locale.h>
 # ifndef LC_COLLATE
 #  define LC_COLLATE 0
 # endif