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

Fix more instances of #include directives where the '#' was not in

Browse Source 
column 1.  From Daniel Richard G. (bug #622)
This commit is contained in:
Todd C. Miller
2013-11-15 15:16:47 -07:00
parent 6d8b078e2b
commit e684f6a096
2 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
configure vendored
View File

@@ -15824,7 +15824,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default $ac_includes_default
#include <sys/socket.h> # include <sys/socket.h>
int int
main () main ()
{ {
@@ -15841,7 +15841,7 @@ else
/* end confdefs.h. */ /* end confdefs.h. */
#define _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED
$ac_includes_default $ac_includes_default
#include <sys/socket.h> # include <sys/socket.h>
int int
main () main ()
{ {
@@ -16502,8 +16502,8 @@ _CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $OSDEFS" CFLAGS="$CFLAGS $OSDEFS"
if test $ac_cv_header_utmpx_h = "yes"; then if test $ac_cv_header_utmpx_h = "yes"; then
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_id" "ac_cv_member_struct_utmpx_ut_id" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_id" "ac_cv_member_struct_utmpx_ut_id" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_id" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_id" = xyes; then :
@@ -16515,8 +16515,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_pid" "ac_cv_member_struct_utmpx_ut_pid" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_pid" "ac_cv_member_struct_utmpx_ut_pid" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_pid" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_pid" = xyes; then :
@@ -16528,8 +16528,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_tv" "ac_cv_member_struct_utmpx_ut_tv" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_tv" "ac_cv_member_struct_utmpx_ut_tv" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_tv" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_tv" = xyes; then :
@@ -16541,8 +16541,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_type" "ac_cv_member_struct_utmpx_ut_type" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_type" "ac_cv_member_struct_utmpx_ut_type" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_type" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_type" = xyes; then :
@@ -16555,8 +16555,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_exit.__e_termination" "ac_cv_member_struct_utmpx_ut_exit___e_termination" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_exit.__e_termination" "ac_cv_member_struct_utmpx_ut_exit___e_termination" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_exit___e_termination" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_exit___e_termination" = xyes; then :
@@ -16570,8 +16570,8 @@ $as_echo "#define HAVE_STRUCT_UTMPX_UT_EXIT 1" >>confdefs.h
else else
ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_exit.e_termination" "ac_cv_member_struct_utmpx_ut_exit_e_termination" " ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_exit.e_termination" "ac_cv_member_struct_utmpx_ut_exit_e_termination" "
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
" "
if test "x$ac_cv_member_struct_utmpx_ut_exit_e_termination" = xyes; then : if test "x$ac_cv_member_struct_utmpx_ut_exit_e_termination" = xyes; then :
@@ -16589,8 +16589,8 @@ fi
else else
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_id" "ac_cv_member_struct_utmp_ut_id" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_id" "ac_cv_member_struct_utmp_ut_id" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_id" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_id" = xyes; then :
@@ -16602,8 +16602,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_pid" "ac_cv_member_struct_utmp_ut_pid" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_pid" "ac_cv_member_struct_utmp_ut_pid" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_pid" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_pid" = xyes; then :
@@ -16615,8 +16615,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_tv" "ac_cv_member_struct_utmp_ut_tv" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_tv" "ac_cv_member_struct_utmp_ut_tv" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_tv" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_tv" = xyes; then :
@@ -16628,8 +16628,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_type" "ac_cv_member_struct_utmp_ut_type" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_type" "ac_cv_member_struct_utmp_ut_type" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_type" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_type" = xyes; then :
@@ -16641,8 +16641,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_user" "ac_cv_member_struct_utmp_ut_user" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_user" "ac_cv_member_struct_utmp_ut_user" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_user" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_user" = xyes; then :
@@ -16655,8 +16655,8 @@ _ACEOF
fi fi
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_exit.__e_termination" "ac_cv_member_struct_utmp_ut_exit___e_termination" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_exit.__e_termination" "ac_cv_member_struct_utmp_ut_exit___e_termination" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_exit___e_termination" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_exit___e_termination" = xyes; then :
@@ -16670,8 +16670,8 @@ $as_echo "#define HAVE_STRUCT_UTMP_UT_EXIT 1" >>confdefs.h
else else
ac_fn_c_check_member "$LINENO" "struct utmp" "ut_exit.e_termination" "ac_cv_member_struct_utmp_ut_exit_e_termination" " ac_fn_c_check_member "$LINENO" "struct utmp" "ut_exit.e_termination" "ac_cv_member_struct_utmp_ut_exit_e_termination" "
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
" "
if test "x$ac_cv_member_struct_utmp_ut_exit_e_termination" = xyes; then : if test "x$ac_cv_member_struct_utmp_ut_exit_e_termination" = xyes; then :
@@ -17093,9 +17093,9 @@ if test "x$ac_cv_func_sysctl" = xyes; then :
#define HAVE_SYSCTL 1 #define HAVE_SYSCTL 1
_ACEOF _ACEOF
ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "ki_tdev" "ac_cv_member_struct_kinfo_proc_ki_tdev" " ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "ki_tdev" "ac_cv_member_struct_kinfo_proc_ki_tdev" "
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
#include <sys/user.h> # include <sys/user.h>
" "
if test "x$ac_cv_member_struct_kinfo_proc_ki_tdev" = xyes; then : if test "x$ac_cv_member_struct_kinfo_proc_ki_tdev" = xyes; then :
@@ -17108,8 +17108,8 @@ _ACEOF
else else
ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_tdev" "ac_cv_member_struct_kinfo_proc2_p_tdev" " ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_tdev" "ac_cv_member_struct_kinfo_proc2_p_tdev" "
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
" "
if test "x$ac_cv_member_struct_kinfo_proc2_p_tdev" = xyes; then : if test "x$ac_cv_member_struct_kinfo_proc2_p_tdev" = xyes; then :
@@ -17122,8 +17122,8 @@ _ACEOF
else else
ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "p_tdev" "ac_cv_member_struct_kinfo_proc_p_tdev" " ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "p_tdev" "ac_cv_member_struct_kinfo_proc_p_tdev" "
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
" "
if test "x$ac_cv_member_struct_kinfo_proc_p_tdev" = xyes; then : if test "x$ac_cv_member_struct_kinfo_proc_p_tdev" = xyes; then :
@@ -17136,8 +17136,8 @@ _ACEOF
else else
ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "kp_eproc.e_tdev" "ac_cv_member_struct_kinfo_proc_kp_eproc_e_tdev" " ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "kp_eproc.e_tdev" "ac_cv_member_struct_kinfo_proc_kp_eproc_e_tdev" "
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
" "
if test "x$ac_cv_member_struct_kinfo_proc_kp_eproc_e_tdev" = xyes; then : if test "x$ac_cv_member_struct_kinfo_proc_kp_eproc_e_tdev" = xyes; then :
@@ -20582,7 +20582,7 @@ $as_echo_n "checking whether lber.h is needed... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/types.h> #include <sys/types.h>
#include <ldap.h> # include <ldap.h>
int int
main () main ()
{ {

51
configure.ac
View File

@@ -2129,11 +2129,11 @@ case "$host_os" in
hpux*) hpux*)
AC_CACHE_CHECK([whether sys/socket.h needs _XOPEN_SOURCE_EXTENDED for MSG_WAITALL], [sudo_cv_xopen_source_extended], AC_CACHE_CHECK([whether sys/socket.h needs _XOPEN_SOURCE_EXTENDED for MSG_WAITALL], [sudo_cv_xopen_source_extended],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
#include <sys/socket.h>], [int a = MSG_WAITALL; return a;])], # include <sys/socket.h>], [int a = MSG_WAITALL; return a;])],
[sudo_cv_xopen_source_extended=no], [ [sudo_cv_xopen_source_extended=no], [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE_EXTENDED AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE_EXTENDED
AC_INCLUDES_DEFAULT AC_INCLUDES_DEFAULT
#include <sys/socket.h>], [int a = MSG_WAITALL; return a;])], # include <sys/socket.h>], [int a = MSG_WAITALL; return a;])],
[sudo_cv_xopen_source_extended=yes], [sudo_cv_xopen_source_extended=yes],
[sudo_cv_xopen_source_extended=error]) [sudo_cv_xopen_source_extended=error])
])]) ])])
@@ -2214,37 +2214,37 @@ _CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $OSDEFS" CFLAGS="$CFLAGS $OSDEFS"
if test $ac_cv_header_utmpx_h = "yes"; then if test $ac_cv_header_utmpx_h = "yes"; then
AC_CHECK_MEMBERS([struct utmpx.ut_id, struct utmpx.ut_pid, struct utmpx.ut_tv, struct utmpx.ut_type], [], [], [ AC_CHECK_MEMBERS([struct utmpx.ut_id, struct utmpx.ut_pid, struct utmpx.ut_tv, struct utmpx.ut_type], [], [], [
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
]) ])
dnl dnl
dnl Check for ut_exit.__e_termination first, then ut_exit.e_termination dnl Check for ut_exit.__e_termination first, then ut_exit.e_termination
dnl dnl
AC_CHECK_MEMBERS([struct utmpx.ut_exit.__e_termination], [AC_DEFINE(HAVE_STRUCT_UTMPX_UT_EXIT)], [ AC_CHECK_MEMBERS([struct utmpx.ut_exit.__e_termination], [AC_DEFINE(HAVE_STRUCT_UTMPX_UT_EXIT)], [
AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination], [AC_DEFINE(HAVE_STRUCT_UTMPX_UT_EXIT)], [], [ AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination], [AC_DEFINE(HAVE_STRUCT_UTMPX_UT_EXIT)], [], [
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
]) ])
], [ ], [
#include <sys/types.h> # include <sys/types.h>
#include <utmpx.h> # include <utmpx.h>
]) ])
else else
AC_CHECK_MEMBERS([struct utmp.ut_id, struct utmp.ut_pid, struct utmp.ut_tv, struct utmp.ut_type, struct utmp.ut_user], [], [], [ AC_CHECK_MEMBERS([struct utmp.ut_id, struct utmp.ut_pid, struct utmp.ut_tv, struct utmp.ut_type, struct utmp.ut_user], [], [], [
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
]) ])
dnl dnl
dnl Check for ut_exit.__e_termination first, then ut_exit.e_termination dnl Check for ut_exit.__e_termination first, then ut_exit.e_termination
dnl dnl
AC_CHECK_MEMBERS([struct utmp.ut_exit.__e_termination], [AC_DEFINE(HAVE_STRUCT_UTMP_UT_EXIT)], [ AC_CHECK_MEMBERS([struct utmp.ut_exit.__e_termination], [AC_DEFINE(HAVE_STRUCT_UTMP_UT_EXIT)], [
AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination], [AC_DEFINE(HAVE_STRUCT_UTMP_UT_EXIT)], [], [ AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination], [AC_DEFINE(HAVE_STRUCT_UTMP_UT_EXIT)], [], [
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
]) ])
], [ ], [
#include <sys/types.h> # include <sys/types.h>
#include <utmp.h> # include <utmp.h>
]) ])
fi fi
CFLAGS="$_CFLAGS" CFLAGS="$_CFLAGS"
@@ -2314,23 +2314,23 @@ AC_CHECK_FUNCS(sysctl, [AC_CHECK_MEMBERS([struct kinfo_proc.ki_tdev], [],
AC_CHECK_MEMBERS([struct kinfo_proc2.p_tdev], [], [ AC_CHECK_MEMBERS([struct kinfo_proc2.p_tdev], [], [
AC_CHECK_MEMBERS([struct kinfo_proc.p_tdev], [], [ AC_CHECK_MEMBERS([struct kinfo_proc.p_tdev], [], [
AC_CHECK_MEMBERS([struct kinfo_proc.kp_eproc.e_tdev], [], [], [ AC_CHECK_MEMBERS([struct kinfo_proc.kp_eproc.e_tdev], [], [], [
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
]) ])
], [ ], [
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
]) ])
], ],
[ [
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
]) ])
], ],
[ [
#include <sys/param.h> # include <sys/param.h>
#include <sys/sysctl.h> # include <sys/sysctl.h>
#include <sys/user.h> # include <sys/user.h>
]) ])
]) ])
@@ -3108,8 +3108,7 @@ if test "${with_skey-'no'}" = "yes"; then
O_CPPFLAGS="$CPPFLAGS" O_CPPFLAGS="$CPPFLAGS"
for dir in "" "/usr/local" "/usr/contrib"; do for dir in "" "/usr/local" "/usr/contrib"; do
test -n "$dir" && CPPFLAGS="$O_CPPFLAGS -I${dir}/include" test -n "$dir" && CPPFLAGS="$O_CPPFLAGS -I${dir}/include"
AC_CHECK_HEADER([skey.h], [found=yes; break], [], AC_CHECK_HEADER([skey.h], [found=yes; break], [], [#include <stdio.h>])
[#include <stdio.h>])
done done
if test "$found" = "no" -o -z "$dir"; then if test "$found" = "no" -o -z "$dir"; then
CPPFLAGS="$O_CPPFLAGS" CPPFLAGS="$O_CPPFLAGS"
@@ -3281,7 +3280,7 @@ if test ${with_ldap-'no'} != "no"; then
dnl check if ldap.h includes lber.h for us dnl check if ldap.h includes lber.h for us
AC_MSG_CHECKING([whether lber.h is needed]) AC_MSG_CHECKING([whether lber.h is needed])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <ldap.h>]], [[(void)ldap_init(0, 0)]])], [AC_MSG_RESULT([no])], [ # include <ldap.h>]], [[(void)ldap_init(0, 0)]])], [AC_MSG_RESULT([no])], [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_LBER_H)]) AC_DEFINE(HAVE_LBER_H)])