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

vstinner · web-flow · commit 0231b6da45b6 · 2021-09-30T03:50:29.000+02:00
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -74,7 +74,7 @@ pytime_as_nanoseconds(_PyTime_t t)
 
 
 // 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)
 {
     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.
-static inline _PyTime_t
+static inline int
 pytime_mul(_PyTime_t *t, _PyTime_t k)
 {
     assert(k > 0);
@@ -1162,13 +1162,13 @@ py_win_perf_counter_frequency(LONGLONG *pfrequency, int raise)
 
 
 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);
 
     static LONGLONG 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;
         }
     }
@@ -1194,7 +1194,7 @@ py_get_win_perf_counter(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
     *tp = pytime_from_nanoseconds(ns);
     return 0;
 }
-#endif
+#endif  // MS_WINDOWS
 
 
 int

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ pytime_as_nanoseconds(_PyTime_t t)`
`74`	`74`
`75`	`75`
`76`	`76`	`// Compute t + t2. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow.`
`77`		`-static inline _PyTime_t`
	`77`	`+static inline int`
`78`	`78`	`pytime_add(_PyTime_t *t, _PyTime_t t2)`
`79`	`79`	`{`
`80`	`80`	`if (t2 > 0 && *t > _PyTime_MAX - t2) {`
`@@ -101,7 +101,7 @@ _PyTime_check_mul_overflow(_PyTime_t a, _PyTime_t b)`
`101`	`101`
`102`	`102`
`103`	`103`	`// Compute t * k. Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow.`
`104`		`-static inline _PyTime_t`
	`104`	`+static inline int`
`105`	`105`	`pytime_mul(_PyTime_t *t, _PyTime_t k)`
`106`	`106`	`{`
`107`	`107`	`assert(k > 0);`
`@@ -1162,13 +1162,13 @@ py_win_perf_counter_frequency(LONGLONG *pfrequency, int raise)`
`1162`	`1162`
`1163`	`1163`
`1164`	`1164`	`static int`
`1165`		`-py_get_win_perf_counter(_PyTime_t tp, _Py_clock_info_t info, int raise)`
	`1165`	`+py_get_win_perf_counter(_PyTime_t tp, _Py_clock_info_t info, int raise_exc)`
`1166`	`1166`	`{`
`1167`	`1167`	`assert(info == NULL \|\| raise_exc);`
`1168`	`1168`
`1169`	`1169`	`static LONGLONG frequency = 0;`
`1170`	`1170`	`if (frequency == 0) {`
`1171`		`- if (py_win_perf_counter_frequency(&frequency, raise) < 0) {`
	`1171`	`+ if (py_win_perf_counter_frequency(&frequency, raise_exc) < 0) {`
`1172`	`1172`	`return -1;`
`1173`	`1173`	`}`
`1174`	`1174`	`}`
`@@ -1194,7 +1194,7 @@ py_get_win_perf_counter(_PyTime_t tp, _Py_clock_info_t info, int raise)`
`1194`	`1194`	`*tp = pytime_from_nanoseconds(ns);`
`1195`	`1195`	`return 0;`
`1196`	`1196`	`}`
`1197`		`-#endif`
	`1197`	`+#endif // MS_WINDOWS`
`1198`	`1198`
`1199`	`1199`
`1200`	`1200`	`int`