diff options
| author | Benjamin Peterson <benjamin@python.org> | 2019-09-10 10:37:59 (GMT) |
|---|---|---|
| committer | T. Wouters <thomas@python.org> | 2019-09-10 10:37:59 (GMT) |
| commit | f1c19031fd5f4cf6faad539e30796b42954527db (patch) | |
| tree | e891a6fb68b448b3f15998f0bd1ce7f509fa004e /Python | |
| parent | c8dfa7333d6317d7cd8c5c7366023f5a668e3f91 (diff) | |
| download | cpython-f1c19031fd5f4cf6faad539e30796b42954527db.zip cpython-f1c19031fd5f4cf6faad539e30796b42954527db.tar.gz cpython-f1c19031fd5f4cf6faad539e30796b42954527db.tar.bz2 | |
bpo-38068: Clean up gettimeofday configure logic. (GH-15775)
Assume gettimeofday exists and takes two arguments.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pytime.c | 4 | ||||
| -rw-r--r-- | Python/thread_pthread.h | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 9ff3006..54ddfc9 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 5678b05..b9a3405 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; \ |