From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 16 Oct 2017 20:48:40 +0000 (-0700)
Subject: Get rid of obsolescent configure test.
X-Git-Tag: tcpdump-4.99-bp~1798
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/d230f8b6870c4f5c3c3156ce78751b86c6b463fb

Get rid of obsolescent configure test.

All UN*Xes, these days, let you include both <time.h> and <sys/time.h>.
---

diff --git a/config.h.in b/config.h.in
index 6d695afa..9915b231 100644
--- a/config.h.in
+++ b/config.h.in
@@ -274,9 +274,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 if you have ether_ntohost() and it works */
 #undef USE_ETHER_NTOHOST
 
diff --git a/configure b/configure
index 4203e731..88020c7f 100755
--- a/configure
+++ b/configure
@@ -4083,42 +4083,6 @@ done
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-
 case "$host_os" in
 
 darwin*)
diff --git a/configure.in b/configure.in
index ef0e8f4f..2c5939de 100644
--- a/configure.in
+++ b/configure.in
@@ -61,8 +61,6 @@ struct rtentry;
 #include <net/if.h>])
 fi
 
-AC_HEADER_TIME
-
 case "$host_os" in
 
 darwin*)
diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index d66a9f02..da1d8dcd 100644
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -231,9 +231,7 @@ typedef char* caddr_t;
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifdef TIME_WITH_SYS_TIME
 #include <time.h>
-#endif
 
 #include <arpa/inet.h>