bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

localename: assume setlocale function


From: Bruno Haible
Subject: localename: assume setlocale function
Date: Sun, 06 Jan 2019 21:26:09 +0100
User-agent: KMail/5.1.3 (Linux/4.4.0-141-generic; KDE/5.18.0; x86_64; ; )

The last platform which lacked setlocale() was probably SunOS 4.


2019-01-06  Bruno Haible  <address@hidden>

        localename: Assume setlocale function.
        * lib/localename.c (gl_locale_name_posix): Assume setlocale exists.
        * m4/localename.m4 (gl_LOCALENAME): Don't test whether setlocale exists.

diff --git a/lib/localename.c b/lib/localename.c
index 83689df..857a76d 100644
--- a/lib/localename.c
+++ b/lib/localename.c
@@ -3269,7 +3269,7 @@ gl_locale_name_posix (int category, const char 
*categoryname)
 
     /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
        On some systems this can be done by the 'setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined 
HAVE_LOCALE_NULL
+#if defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
     locname = setlocale (category, NULL);
 #else
     /* On other systems we ignore what setlocale reports and instead look at 
the
diff --git a/m4/localename.m4 b/m4/localename.m4
index bfa19ef..a9f629d 100644
--- a/m4/localename.m4
+++ b/m4/localename.m4
@@ -1,4 +1,4 @@
-# localename.m4 serial 5
+# localename.m4 serial 6
 dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,6 @@ AC_DEFUN([gl_LOCALENAME],
   AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
   AC_REQUIRE([gt_INTL_MACOSX])
   AC_CHECK_HEADERS_ONCE([langinfo.h])
-  AC_CHECK_FUNCS([setlocale])
   AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale])
   if test $ac_cv_func_newlocale != yes; then
     HAVE_NEWLOCALE=0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]