From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 10 Sep 2015 22:44:57 +0000 (-0600)
Subject: Remove checks for __sys_siglist and __sys_signame.  They are internal
X-Git-Tag: SUDO_1_8_15^2~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2979ed80990cd065193b25a36a8b57f5007ce08;p=sudo

Remove checks for __sys_siglist and __sys_signame.  They are internal
to libc and there are no known systems that export those symbols
that do not already export the single underbar or no-underbar versions.
---

diff --git a/config.h.in b/config.h.in
index 29e922eb8..2fcbaadd2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -181,14 +181,6 @@
    don't. */
 #undef HAVE_DECL__SYS_SIGNAME
 
-/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL___SYS_SIGLIST
-
-/* Define to 1 if you have the declaration of `__sys_signame', and to 0 if you
-   don't. */
-#undef HAVE_DECL___SYS_SIGNAME
-
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
diff --git a/configure b/configure
index b82135518..0a638a320 100755
--- a/configure
+++ b/configure
@@ -21367,26 +21367,6 @@ if test $ac_have_decl = 1; then :
 	HAVE_SIGLIST="true"
 	break
 
-fi
-ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "
-$ac_includes_default
-#include <signal.h>
-
-"
-if test "x$ac_cv_have_decl___sys_siglist" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL___SYS_SIGLIST $ac_have_decl
-_ACEOF
-if test $ac_have_decl = 1; then :
-
-	HAVE_SIGLIST="true"
-	break
-
 fi
 
     if test "$HAVE_SIGLIST" != "true"; then
@@ -21478,26 +21458,6 @@ if test $ac_have_decl = 1; then :
 	HAVE_SIGNAME="true"
 	break
 
-fi
-ac_fn_c_check_decl "$LINENO" "__sys_signame" "ac_cv_have_decl___sys_signame" "
-$ac_includes_default
-#include <signal.h>
-
-"
-if test "x$ac_cv_have_decl___sys_signame" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL___SYS_SIGNAME $ac_have_decl
-_ACEOF
-if test $ac_have_decl = 1; then :
-
-	HAVE_SIGNAME="true"
-	break
-
 fi
 ac_fn_c_check_decl "$LINENO" "sys_sigabbrev" "ac_cv_have_decl_sys_sigabbrev" "
 $ac_includes_default
diff --git a/configure.ac b/configure.ac
index 39f615ff3..98a591ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3110,7 +3110,7 @@ AC_CHECK_FUNCS([strsignal], [], [
     AC_LIBOBJ(strsignal)
     SUDO_APPEND_COMPAT_EXP(sudo_strsignal)
     HAVE_SIGLIST="false"
-    AC_CHECK_DECLS([sys_siglist, _sys_siglist, __sys_siglist], [
+    AC_CHECK_DECLS([sys_siglist, _sys_siglist], [
 	HAVE_SIGLIST="true"
 	break
     ], [ ], [
@@ -3132,7 +3132,7 @@ AC_CHECK_FUNCS([sig2str], [
     AC_LIBOBJ(sig2str)
     SUDO_APPEND_COMPAT_EXP(sudo_sig2str)
     HAVE_SIGNAME="false"
-    AC_CHECK_DECLS([sys_signame, _sys_signame, __sys_signame, sys_sigabbrev], [
+    AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
 	HAVE_SIGNAME="true"
 	break
     ], [ ], [
diff --git a/lib/util/sig2str.c b/lib/util/sig2str.c
index 7b4426b58..9e7d90ca2 100644
--- a/lib/util/sig2str.c
+++ b/lib/util/sig2str.c
@@ -38,8 +38,6 @@
 #  define sudo_sys_signame	sys_signame
 #elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
 #  define sudo_sys_signame	_sys_signame
-#elif defined(HAVE_DECL___SYS_SIGNAME) && HAVE_DECL___SYS_SIGNAME == 1
-#  define sudo_sys_signame	__sys_signame
 #elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
 #  define sudo_sys_signame	sys_sigabbrev
 #else
diff --git a/lib/util/strsignal.c b/lib/util/strsignal.c
index 81a234a83..24ee81bb4 100644
--- a/lib/util/strsignal.c
+++ b/lib/util/strsignal.c
@@ -32,8 +32,6 @@
 # define sudo_sys_siglist	sys_siglist
 #elif defined(HAVE_DECL__SYS_SIGLIST) && HAVE_DECL__SYS_SIGLIST == 1
 # define sudo_sys_siglist	_sys_siglist
-#elif defined(HAVE_DECL___SYS_SIGLIST) && HAVE_DECL___SYS_SIGLIST == 1
-# define sudo_sys_siglist	__sys_siglist
 #else
 extern const char *const sudo_sys_siglist[NSIG];
 #endif