From c26b682381a6cb567c95bc8336052f5fca98e87d Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Fri, 2 Dec 2022 17:06:47 +0100 Subject: [PATCH] Assume exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ISO C99 requires . Other files in the project already include unconditionally, so it's reasonable to assume that it is always available. Link: Cc: Christian Göttsche Cc: Iker Pedrosa Cc: Mike Frysinger Signed-off-by: Alejandro Colomar --- configure.ac | 2 +- lib/defines.h | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index d0081a30..32a162f1 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ dnl Checks for header files. AC_CHECK_HEADERS(crypt.h fcntl.h unistd.h sys/time.h utmp.h \ utmpx.h termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \ utime.h ulimit.h sys/capability.h sys/random.h sys/resource.h \ - gshadow.h lastlog.h locale.h rpc/key_prot.h netdb.h acl/libacl.h \ + gshadow.h lastlog.h rpc/key_prot.h netdb.h acl/libacl.h \ attr/libattr.h attr/error_context.h) dnl shadow now uses the libc's shadow implementation diff --git a/lib/defines.h b/lib/defines.h index a849e5a7..e059944d 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -18,15 +18,7 @@ extern char * textdomain (const char * domainname); # define ngettext(Msgid1, Msgid2, N) \ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) #else -#ifdef HAVE_LOCALE_H -# include -#else -# undef setlocale -# define setlocale(category, locale) (NULL) -# ifndef LC_ALL -# define LC_ALL 6 -# endif -#endif +#include #define gettext_noop(String) (String) /* #define gettext_def(String) "#define String" */