From bd1adcffe7f3e51f490bf57889e7454816661196 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Fri, 8 Jan 2021 23:48:43 +0100
Subject: [PATCH] configure: drop macro 'AC_HEADER_TIME'

The macro AC_HEADER_TIME has been obsoleted by autoconf 2.70.

Not all systems provide 'sys/time.h', plus some old system didn't
allowed to include both 'time.h' and 'sys/time.h' because 'time.h'
was included by 'sys/time.h' and was not properly protected to
allow multiple inclusion.
The macro AC_HEADER_TIME helps to detect such odd case.
Nowadays all the systems properly protect 'time.h', so its safe to
unconditionally include 'time.h', even if it is also included by
'sys/time.h'.

The case of systems without 'sys/time.h' is already covered by
configure.ac through the directive
	AC_CHECK_HEADERS([sys/time.h])

Remove the obsoleted autoconf macro and simplify the code by
including 'time.h' unconditionally and check HAVE_SYS_TIME_H to
include 'sys/time.h'.

Change-Id: Iddb3f3f1d90c22668b97f8e756e1b4f733367a7d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6010
Tested-by: jenkins
Reviewed-by: Marc Schink <dev@zapb.de>
---
 configure.ac              |  1 -
 src/helper/system.h       | 14 +++-----------
 src/helper/time_support.h | 13 ++++---------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6d0c7d096d..d7133183c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AC_CHECK_HEADERS([arpa/inet.h ifaddrs.h netinet/in.h netinet/tcp.h net/if.h], []
 
 AC_HEADER_ASSERT
 AC_HEADER_STDBOOL
-AC_HEADER_TIME
 
 AC_C_BIGENDIAN
 
diff --git a/src/helper/system.h b/src/helper/system.h
index 97b3443bed..1aaca3b33e 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -28,19 +28,11 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <time.h>
 
-/* +++ AC_HEADER_TIME +++ */
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-/* --- AC_HEADER_TIME --- */
 
 /* +++ platform specific headers +++ */
 #ifdef _WIN32
diff --git a/src/helper/time_support.h b/src/helper/time_support.h
index 7abbdb24d2..a9f2dffad0 100644
--- a/src/helper/time_support.h
+++ b/src/helper/time_support.h
@@ -25,15 +25,10 @@
 #ifndef OPENOCD_HELPER_TIME_SUPPORT_H
 #define OPENOCD_HELPER_TIME_SUPPORT_H
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#include <time.h>
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
 
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-- 
2.30.2