From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 12 Dec 2022 18:46:17 +0000 (+0100)
Subject: Remove code conditional on S_SPLINT_S
X-Git-Tag: 4.14.0-rc1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dfa71f71cd0665ec2b5d45d7e9ae9a35ab74011;p=thirdparty%2Fshadow.git

Remove code conditional on S_SPLINT_S

I don't know for sure what that is, but it's redefining setlocale(3)
and LC_ALL, which is are defined by C99, so it's supect of being some
variety of an extinct dynosaur.  Maybe related to the Dodo.

Link: <https://github.com/shadow-maint/shadow/pull/600>
Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/defines.h b/lib/defines.h
index 748e18da0..2a6189f8c 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -7,17 +7,6 @@
 #include "config.h"
 
 #include <stdbool.h>
-
-/* Take care of NLS matters.  */
-#ifdef S_SPLINT_S
-extern char *setlocale(int categories, const char *locale);
-# define LC_ALL		(6)
-extern char * bindtextdomain (const char * domainname, const char * dirname);
-extern char * textdomain (const char * domainname);
-# define _(Text) Text
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#else
 #include <locale.h>
 
 #define gettext_noop(String) (String)
@@ -35,7 +24,6 @@ extern char * textdomain (const char * domainname);
 # define ngettext(Msgid1, Msgid2, N) \
     ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
 #endif
-#endif
 
 #include <stdlib.h>
 #include <string.h>