mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
gh-89886: Rely on HAVE_SYS_TIME_H (#105058)
Quoting autoconf (v2.71): All current systems provide time.h; it need not be checked for. Not all systems provide sys/time.h, but those that do, all allow you to include it and time.h simultaneously.
This commit is contained in:
parent
76b9c0cfaa
commit
9ab587b714
|
@ -11,7 +11,10 @@
|
|||
#include <signal.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h> // free()
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
#if defined(HAVE_SETLOCALE)
|
||||
/* GNU readline() mistakenly sets the LC_CTYPE locale.
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include <sys/resource.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
|
10
configure
generated
vendored
10
configure
generated
vendored
|
@ -19273,14 +19273,6 @@ fi
|
|||
done
|
||||
|
||||
|
||||
if test "x$ac_cv_header_sys_time_h" = xyes; then :
|
||||
|
||||
|
||||
$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
|
||||
# checks for structures
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
|
||||
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
|
||||
|
@ -26043,7 +26035,7 @@ $as_echo_n "checking for stdlib extension module pyexpat... " >&6; }
|
|||
if test "$py_cv_module_pyexpat" != "n/a"; then :
|
||||
|
||||
if true; then :
|
||||
if true; then :
|
||||
if test "$ac_cv_header_sys_time_h" = "yes"; then :
|
||||
py_cv_module_pyexpat=yes
|
||||
else
|
||||
py_cv_module_pyexpat=missing
|
||||
|
|
10
configure.ac
10
configure.ac
|
@ -5305,12 +5305,6 @@ fi
|
|||
|
||||
AC_CHECK_FUNCS([getnameinfo])
|
||||
|
||||
dnl autoconf 2.71 deprecates AC_HEADER_TIME, keep for backwards compatibility
|
||||
dnl TIME_WITH_SYS_TIME works on all supported systems that have sys/time.h
|
||||
AS_VAR_IF([ac_cv_header_sys_time_h], [yes], [
|
||||
AC_DEFINE([TIME_WITH_SYS_TIME], 1, [Define to 1 if you can safely include both <sys/time.h> and <time.h>.])
|
||||
])
|
||||
|
||||
# checks for structures
|
||||
AC_STRUCT_TM
|
||||
AC_STRUCT_TIMEZONE
|
||||
|
@ -7296,7 +7290,9 @@ PY_STDLIB_MOD([syslog], [], [test "$ac_cv_header_syslog_h" = yes])
|
|||
PY_STDLIB_MOD([termios], [], [test "$ac_cv_header_termios_h" = yes])
|
||||
|
||||
dnl _elementtree loads libexpat via CAPI hook in pyexpat
|
||||
PY_STDLIB_MOD([pyexpat], [], [], [$LIBEXPAT_CFLAGS], [$LIBEXPAT_LDFLAGS])
|
||||
PY_STDLIB_MOD([pyexpat],
|
||||
[], [test "$ac_cv_header_sys_time_h" = "yes"],
|
||||
[$LIBEXPAT_CFLAGS], [$LIBEXPAT_LDFLAGS])
|
||||
PY_STDLIB_MOD([_elementtree], [], [], [$LIBEXPAT_CFLAGS], [])
|
||||
PY_STDLIB_MOD_SIMPLE([_codecs_cn])
|
||||
PY_STDLIB_MOD_SIMPLE([_codecs_hk])
|
||||
|
|
|
@ -1682,9 +1682,6 @@
|
|||
/* Library needed by timemodule.c: librt may be needed for clock_gettime() */
|
||||
#undef TIMEMODULE_LIB
|
||||
|
||||
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
||||
#undef TIME_WITH_SYS_TIME
|
||||
|
||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||
#undef TM_IN_SYS_TIME
|
||||
|
||||
|
|
Loading…
Reference in a new issue