From f1c19031fd5f4cf6faad539e30796b42954527db Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 10 Sep 2019 11:37:59 +0100
Subject: [PATCH] bpo-38068: Clean up gettimeofday configure logic. (GH-15775)

Assume gettimeofday exists and takes two arguments.
---
 Python/pytime.c         |  4 ----
 Python/thread_pthread.h |  9 +--------
 configure               | 31 -------------------------------
 configure.ac            |  9 ---------
 pyconfig.h.in           |  7 -------
 5 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/Python/pytime.c b/Python/pytime.c
index 9ff300699f..54ddfc952b 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -718,11 +718,7 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
 #else   /* HAVE_CLOCK_GETTIME */
 
      /* test gettimeofday() */
-#ifdef GETTIMEOFDAY_NO_TZ
-    err = gettimeofday(&tv);
-#else
     err = gettimeofday(&tv, (struct timezone *)NULL);
-#endif
     if (err) {
         if (raise) {
             PyErr_SetFromErrno(PyExc_OSError);
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 5678b05ced..b9a340530c 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -97,17 +97,10 @@
 #endif
 
 
-/* We assume all modern POSIX systems have gettimeofday() */
-#ifdef GETTIMEOFDAY_NO_TZ
-#define GETTIMEOFDAY(ptv) gettimeofday(ptv)
-#else
-#define GETTIMEOFDAY(ptv) gettimeofday(ptv, (struct timezone *)NULL)
-#endif
-
 #define MICROSECONDS_TO_TIMESPEC(microseconds, ts) \
 do { \
     struct timeval tv; \
-    GETTIMEOFDAY(&tv); \
+    gettimeofday(&tv, NULL); \
     tv.tv_usec += microseconds % 1000000; \
     tv.tv_sec += microseconds / 1000000; \
     tv.tv_sec += tv.tv_usec / 1000000; \
diff --git a/configure b/configure
index d4d59be860..cb60ce256d 100755
--- a/configure
+++ b/configure
@@ -12735,37 +12735,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 $as_echo "#define SETPGRP_HAVE_ARG 1" >>confdefs.h
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-done
-
-for ac_func in gettimeofday
-do :
-  ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETTIMEOFDAY 1
-_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/time.h>
-int
-main ()
-{
-gettimeofday((struct timeval*)0,(struct timezone*)0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-
-$as_echo "#define GETTIMEOFDAY_NO_TZ 1" >>confdefs.h
-
-
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
diff --git a/configure.ac b/configure.ac
index 43514129dd..9f5cea5ca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3865,15 +3865,6 @@ AC_CHECK_FUNCS(setpgrp,
     [AC_DEFINE(SETPGRP_HAVE_ARG, 1, [Define if setpgrp() must be called as setpgrp(0, 0).])],
     [])
 )
-AC_CHECK_FUNCS(gettimeofday,
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]],
-  				     [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],
-    [],
-    [AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
-      [Define if gettimeofday() does not have second (timezone) argument
-       This is the case on Motorola V4 (R40V4.2)])
-    ])
-)
 
 # We search for both crypt and crypt_r as one or the other may be defined
 # This gets us our -lcrypt in LIBS when required on the target platform.
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 840fbcdb2a..5ff5cc2282 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -44,10 +44,6 @@
 /* Define if getpgrp() must be called as getpgrp(0). */
 #undef GETPGRP_HAVE_ARG
 
-/* Define if gettimeofday() does not have second (timezone) argument This is
-   the case on Motorola V4 (R40V4.2) */
-#undef GETTIMEOFDAY_NO_TZ
-
 /* Define to 1 if you have the `accept4' function. */
 #undef HAVE_ACCEPT4
 
@@ -510,9 +506,6 @@
 /* Define to 1 if you have the `getspnam' function. */
 #undef HAVE_GETSPNAM
 
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
 /* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
-- 
2.40.0