isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove checks for __sys_siglist and __sys_signame. They are internal

Browse Source 
to libc and there are no known systems that export those symbols
that do not already export the single underbar or no-underbar versions.
This commit is contained in:
Todd C. Miller
2015-09-10 16:44:57 -06:00
parent 9ff93c307b
commit a2979ed809
5 changed files with 2 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config.h.in
View File

@@ -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

40
configure vendored
View File

@@ -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

4
configure.ac
View File

@@ -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
], [ ], [

2
lib/util/sig2str.c
View File

@@ -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

2
lib/util/strsignal.c
View File

@@ -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