From 39ab891ce2ce7384f51648441cd6f7d394bb1cc4 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Thu, 4 Sep 2014 02:57:49 +0200
Subject: [PATCH] setlocale is C89, so assume it exists.

---
 src/configure.in                 | 1 -
 src/modules/Gettext/configure.in | 2 +-
 src/modules/Java/jvm.c           | 2 --
 src/pike_embed.c                 | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/configure.in b/src/configure.in
index be6c560f5c..5423393d26 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -4525,7 +4525,6 @@ AC_CHECK_FUNCS( \
  mallinfo \
  mallopt \
  ptrace \
- setlocale \
  setrlimit \
  setresuid \
  signal \
diff --git a/src/modules/Gettext/configure.in b/src/modules/Gettext/configure.in
index 4f00ab8f14..46650ad173 100644
--- a/src/modules/Gettext/configure.in
+++ b/src/modules/Gettext/configure.in
@@ -13,7 +13,7 @@ AC_CHECK_LIB(iconv, libiconv)
 AC_SEARCH_LIBS(iconv, iconv)
 AC_CHECK_LIB(intl, gettext)
 AC_SEARCH_LIBS(gettext, intl libintl)
-AC_CHECK_FUNCS(setlocale gettext iconv)
+AC_CHECK_FUNCS(gettext iconv)
 
 AC_ARG_WITH(nlsdir, 
 	[  --with-nlsdir=PATH      specify where the locale stuff should go ])
diff --git a/src/modules/Java/jvm.c b/src/modules/Java/jvm.c
index d130699dd4..808b5d0d00 100644
--- a/src/modules/Java/jvm.c
+++ b/src/modules/Java/jvm.c
@@ -3446,7 +3446,6 @@ static void f_create(INT32 args)
   }
 
   /* Java tries to be a wiseguy with the locale... */
-#ifdef HAVE_SETLOCALE
 #ifdef LC_NUMERIC
   setlocale(LC_NUMERIC, "C");
 #endif
@@ -3461,7 +3460,6 @@ static void f_create(INT32 args)
 #endif
 #ifdef LC_MESSAGES
   setlocale(LC_MESSAGES, "");
-#endif
 #endif
 
   cls = (*j->env)->FindClass(j->env, "java/lang/Object");
diff --git a/src/pike_embed.c b/src/pike_embed.c
index 9bf882721c..8ea8b03caf 100644
--- a/src/pike_embed.c
+++ b/src/pike_embed.c
@@ -160,7 +160,6 @@ void init_pike(char **argv, const char *file)
   tzset();
 #endif /* HAVE_TZSET */
 
-#ifdef HAVE_SETLOCALE
 #ifdef LC_NUMERIC
   setlocale(LC_NUMERIC, "C");
 #endif
@@ -176,7 +175,6 @@ void init_pike(char **argv, const char *file)
 #ifdef LC_MESSAGES
   setlocale(LC_MESSAGES, "");
 #endif
-#endif
 }
 
 static void (*pike_exit_cb)(int);
-- 
GitLab