traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38068: Clean up gettimeofday configure logic. (GH-15775) 

Assume gettimeofday exists and takes two arguments.
This commit is contained in:
Benjamin Peterson 2019-09-10 11:37:59 +01:00 committed by T. Wouters
parent c8dfa7333d
commit f1c19031fd
5 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/pytime.c
View File

@ -718,11 +718,7 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
#else /* HAVE_CLOCK_GETTIME */ #else /* HAVE_CLOCK_GETTIME */
/* test gettimeofday() */ /* test gettimeofday() */
#ifdef GETTIMEOFDAY_NO_TZ
err = gettimeofday(&tv);
#else
err = gettimeofday(&tv, (struct timezone *)NULL); err = gettimeofday(&tv, (struct timezone *)NULL);
#endif
if (err) { if (err) {
if (raise) { if (raise) {
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);

9
Python/thread_pthread.h
View File

@ -97,17 +97,10 @@
#endif #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) \ #define MICROSECONDS_TO_TIMESPEC(microseconds, ts) \
do { \ do { \
struct timeval tv; \ struct timeval tv; \
GETTIMEOFDAY(&tv); \ gettimeofday(&tv, NULL); \
tv.tv_usec += microseconds % 1000000; \ tv.tv_usec += microseconds % 1000000; \
tv.tv_sec += microseconds / 1000000; \ tv.tv_sec += microseconds / 1000000; \
tv.tv_sec += tv.tv_usec / 1000000; \ tv.tv_sec += tv.tv_usec / 1000000; \

31
configure vendored
View File

@ -12735,37 +12735,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "#define SETPGRP_HAVE_ARG 1" >>confdefs.h $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 fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9
configure.ac
View File

@ -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_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 # 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. # This gets us our -lcrypt in LIBS when required on the target platform.

7
pyconfig.h.in
View File

@ -44,10 +44,6 @@
/* Define if getpgrp() must be called as getpgrp(0). */ /* Define if getpgrp() must be called as getpgrp(0). */
#undef GETPGRP_HAVE_ARG #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. */ /* Define to 1 if you have the `accept4' function. */
#undef HAVE_ACCEPT4 #undef HAVE_ACCEPT4
@ -510,9 +506,6 @@
/* Define to 1 if you have the `getspnam' function. */ /* Define to 1 if you have the `getspnam' function. */
#undef HAVE_GETSPNAM #undef HAVE_GETSPNAM
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `getwd' function. */ /* Define to 1 if you have the `getwd' function. */
#undef HAVE_GETWD #undef HAVE_GETWD