From b1d0cb241323066c0a5cc3ad2d9da1a433263d74 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 18 Oct 2006 12:03:51 +0000 Subject: [PATCH] No need any more to check for setlocale - all systems have it. --- ChangeLog | 5 +++++ lib/localcharset.c | 4 ++-- m4/localcharset.m4 | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0a6873abb..b4da51bc1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-17 Paul Eggert + + * lib/localcharset.c: Do not check HAVE_SETLOCALE. + * m4/localcharset.m4 (gl_LOCALCHARSET): Don't check for setlocale. + 2006-10-17 Eric Blake * lib/sigprocmask.c (sigprocmask): Fix typo. diff --git a/lib/localcharset.c b/lib/localcharset.c index a2fc5dc553..a0f7cca691 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -41,7 +41,7 @@ # if HAVE_LANGINFO_CODESET # include # else -# if HAVE_SETLOCALE +# if 0 /* see comment below */ # include # endif # endif @@ -351,7 +351,7 @@ locale_charset (void) (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't use setlocale here; it would return "C" when it doesn't support the locale name the user has set. */ -# if HAVE_SETLOCALE && 0 +# if 0 locale = setlocale (LC_CTYPE, NULL); # endif if (locale == NULL || locale[0] == '\0') diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index c0396356ce..b2b77338e3 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,4 +1,4 @@ -# localcharset.m4 serial 4 +# localcharset.m4 serial 5 dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,6 @@ AC_DEFUN([gl_LOCALCHARSET], dnl Prerequisites of lib/localcharset.c. AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CHECK_DECLS_ONCE(getc_unlocked) - AC_CHECK_FUNCS_ONCE(setlocale) dnl Prerequisites of the lib/Makefile.am snippet. AC_REQUIRE([AC_CANONICAL_HOST]) -- 2.30.2