Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:
Erlend E. Aasland 2023-06-01 13:37:40 +02:00 committed by GitHub
parent 76b9c0cfaa
commit 9ab587b714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/readline.c
View File

@ -11,7 +11,10 @@
#include <signal.h> #include <signal.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> // free() #include <stdlib.h> // free()
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif
#include <time.h>
#if defined(HAVE_SETLOCALE) #if defined(HAVE_SETLOCALE)
/* GNU readline() mistakenly sets the LC_CTYPE locale. /* GNU readline() mistakenly sets the LC_CTYPE locale.

3
Modules/resource.c
View File

@ -1,7 +1,10 @@
#include "Python.h" #include "Python.h"
#include <sys/resource.h> #include <sys/resource.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif
#include <time.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>

10
configure generated vendored
View File

@ -19273,14 +19273,6 @@ fi
done 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 # 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 "$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; } $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 test "$py_cv_module_pyexpat" != "n/a"; then :
if true; then : if true; then :
if true; then : if test "$ac_cv_header_sys_time_h" = "yes"; then :
py_cv_module_pyexpat=yes py_cv_module_pyexpat=yes
else else
py_cv_module_pyexpat=missing py_cv_module_pyexpat=missing

10
configure.ac
View File

@ -5305,12 +5305,6 @@ fi
AC_CHECK_FUNCS([getnameinfo]) 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 # checks for structures
AC_STRUCT_TM AC_STRUCT_TM
AC_STRUCT_TIMEZONE 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]) PY_STDLIB_MOD([termios], [], [test "$ac_cv_header_termios_h" = yes])
dnl _elementtree loads libexpat via CAPI hook in pyexpat 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([_elementtree], [], [], [$LIBEXPAT_CFLAGS], [])
PY_STDLIB_MOD_SIMPLE([_codecs_cn]) PY_STDLIB_MOD_SIMPLE([_codecs_cn])
PY_STDLIB_MOD_SIMPLE([_codecs_hk]) PY_STDLIB_MOD_SIMPLE([_codecs_hk])

3
pyconfig.h.in
View File

@ -1682,9 +1682,6 @@
/* Library needed by timemodule.c: librt may be needed for clock_gettime() */ /* Library needed by timemodule.c: librt may be needed for clock_gettime() */
#undef TIMEMODULE_LIB #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'. */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME #undef TM_IN_SYS_TIME