CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-10-21 19:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove obsolete AC_HEADER_TIME

Browse source
This commit is contained in:
dmiller 2026-08-14 17:16:15 +00:00
parent 3e2fc8533a
commit 58facd5fbf
15 changed files with 31 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nbase/configure vendored
View file

@ -2408,7 +2408,6 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
# Auxiliary files required by this configure script.
ac_aux_files="config.guess config.sub"
@ -4063,6 +4062,12 @@ if test "x$ac_cv_header_sys_select_h" = xyes
then :
printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
fi
ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_time_h" = xyes
then :
printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
fi
ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_types_h" = xyes
@ -4131,16 +4136,6 @@ then :
fi
# Obsolete code to be removed.
if test $ac_cv_header_sys_time_h = yes; then
printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
# End of obsolete code.
ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_socket_h" = xyes
then :

6
nbase/configure.ac
View file

@ -67,8 +67,10 @@ esac
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS( string.h getopt.h strings.h sys/param.h sys/time.h unistd.h errno.h sys/select.h sys/types.h sys/socket.h netinet/in.h arpa/inet.h sys/stat.h netdb.h sys/wait.h fcntl.h sys/resource.h inttypes.h mach-o/dyld.h)
AC_HEADER_TIME
AC_CHECK_HEADERS([string.h getopt.h strings.h sys/param.h sys/time.h unistd.h
errno.h sys/select.h sys/time.h sys/types.h sys/socket.h
netinet/in.h arpa/inet.h sys/stat.h netdb.h sys/wait.h
fcntl.h sys/resource.h inttypes.h mach-o/dyld.h])
dnl A special check required for <net/if.h> on Darwin. See
dnl http://www.gnu.org/software/autoconf/manual/html_node/Header-Portability.html.
AC_CHECK_HEADERS([sys/socket.h])

3
ncat/config.h.in
View file

@ -177,9 +177,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Define to empty if `const' does not conform to ANSI C. */
#undef const

11
ncat/configure vendored
View file

@ -2451,7 +2451,6 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
as_fn_append ac_header_c_list " vfork.h vfork_h HAVE_VFORK_H"
as_fn_append ac_func_c_list " fork HAVE_FORK"
as_fn_append ac_func_c_list " vfork HAVE_VFORK"
@ -4438,16 +4437,6 @@ printf "%s\n" "#define const /**/" >>confdefs.h
fi
# Obsolete code to be removed.
if test $ac_cv_header_sys_time_h = yes; then
printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
# End of obsolete code.
# Checks for library functions.
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default

1
ncat/configure.ac
View file

@ -46,7 +46,6 @@ AC_CHECK_HEADERS([linux/vm_sockets.h], , , [#include <sys/socket.h>])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STAT
AC_C_CONST
AC_HEADER_TIME
# Checks for library functions.
AC_FUNC_FORK

1
nmap_config.h.in
View file

@ -123,7 +123,6 @@
#undef SPRINTF_RETURNS_STRING
#undef TIME_WITH_SYS_TIME
#undef HAVE_SYS_TIME_H
#undef recvfrom6_t

12
nmap_error.cc
View file

@ -66,16 +66,10 @@
#include "xml.h"
#include <errno.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
extern NmapOps o;

12
nmap_tty.cc
View file

@ -79,16 +79,10 @@
#endif
#include <stdlib.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
#include "nmap_tty.h"
#include "NmapOps.h"

2
nping/configure.ac
View file

@ -116,7 +116,7 @@ AC_PATH_TOOL([STRIP], [strip], [/bin/true])
needs_cpp_precomp=no
dnl Checks for header files.
AC_CHECK_HEADERS(pwd.h termios.h sys/sockio.h)
AC_CHECK_HEADERS(pwd.h termios.h sys/sockio.h sys/time.h)
dnl If any socket libraries needed
AC_SEARCH_LIBS(setsockopt, socket)

10
nping/nping.h
View file

@ -130,16 +130,10 @@
#include <netdb.h>
#endif
#if TIME_WITH_SYS_TIME
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <time.h>
#else
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <time.h>
# endif
#endif
#include <time.h>
#ifdef HAVE_PWD_H
#include <pwd.h>

1
nping/nping_config.h.in
View file

@ -120,7 +120,6 @@
#undef SPRINTF_RETURNS_STRING
#undef TIME_WITH_SYS_TIME
#undef HAVE_SYS_TIME_H
#undef recvfrom6_t

12
nping/stats.h
View file

@ -85,16 +85,10 @@
#include <unistd.h>
#endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
/* Make sure we define a 64bit integer type */
#ifndef u64_t

12
output.h
View file

@ -112,16 +112,10 @@ class Target;
#include <stdarg.h>
#include <string>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
/* Prints the familiar Nmap tabular output showing the "interesting"
ports found on the machine. It also handles the Machine/Grepable

12
service_scan.cc
View file

@ -90,16 +90,10 @@
#include <openssl/ssl.h>
#endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
#ifndef IPPROTO_SCTP
#include "libnetutil/netutil.h"

12
timing.h
View file

@ -66,16 +66,10 @@
#ifndef NMAP_TIMING_H
#define NMAP_TIMING_H
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
#include <nbase.h> /* u32 */