mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-41710: Fix building pytime.c on Windows (GH-28644)

Browse source
This commit is contained in:
Victor Stinner 2021-09-30 03:50:29 +02:00 • committed by GitHub
parent d62d925823
commit 0231b6da45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Python/pytime.c
View file

@ -74,7 +74,7 @@ pytime_as_nanoseconds(_PyTime_t t)
// Compute t + t2. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow. // Compute t + t2. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow.
static inline _PyTime_t static inline int
pytime_add(_PyTime_t *t, _PyTime_t t2) pytime_add(_PyTime_t *t, _PyTime_t t2)
{ {
if (t2 > 0 && *t > _PyTime_MAX - t2) { if (t2 > 0 && *t > _PyTime_MAX - t2) {
@ -101,7 +101,7 @@ _PyTime_check_mul_overflow(_PyTime_t a, _PyTime_t b)
// Compute t * k. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow. // Compute t * k. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow.
static inline _PyTime_t static inline int
pytime_mul(_PyTime_t *t, _PyTime_t k) pytime_mul(_PyTime_t *t, _PyTime_t k)
{ {
assert(k > 0); assert(k > 0);
@ -1162,13 +1162,13 @@ py_win_perf_counter_frequency(LONGLONG *pfrequency, int raise)
static int static int
py_get_win_perf_counter(_PyTime_t *tp, _Py_clock_info_t *info, int raise) py_get_win_perf_counter(_PyTime_t *tp, _Py_clock_info_t *info, int raise_exc)
{ {
assert(info == NULL || raise_exc); assert(info == NULL || raise_exc);
static LONGLONG frequency = 0; static LONGLONG frequency = 0;
if (frequency == 0) { if (frequency == 0) {
if (py_win_perf_counter_frequency(&frequency, raise) < 0) { if (py_win_perf_counter_frequency(&frequency, raise_exc) < 0) {
return -1; return -1;
} }
} }
@ -1194,7 +1194,7 @@ py_get_win_perf_counter(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
*tp = pytime_from_nanoseconds(ns); *tp = pytime_from_nanoseconds(ns);
return 0; return 0;
} }
#endif #endif // MS_WINDOWS
int int