gh-81057: Fix an ifdef in the time module (#100125)

ericsnowcurrently · web-flow · commit 3e06b5030b18 · 2022-12-08T18:16:37.000-07:00
An earlier commit only defined check_ticks_per_second() when HAVE_TIMES is defined. However, we also need it when HAVE_CLOCK is defined. This primarily affects Windows. #81057
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -62,8 +62,7 @@
 #define SEC_TO_NS (1000 * 1000 * 1000)
 
 
-#ifdef HAVE_TIMES
-
+#if defined(HAVE_TIMES) || defined(HAVE_CLOCK)
 static int
 check_ticks_per_second(long tps, const char *context)
 {
@@ -75,6 +74,9 @@ check_ticks_per_second(long tps, const char *context)
     }
     return 0;
 }
+#endif  /* HAVE_TIMES || HAVE_CLOCK */
+
+#ifdef HAVE_TIMES
 
 # define ticks_per_second _PyRuntime.time.ticks_per_second
 

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@`
`62`	`62`	`#define SEC_TO_NS (1000 * 1000 * 1000)`
`63`	`63`
`64`	`64`
`65`		`-#ifdef HAVE_TIMES`
`66`		`-`
	`65`	`+#if defined(HAVE_TIMES) \|\| defined(HAVE_CLOCK)`
`67`	`66`	`static int`
`68`	`67`	`check_ticks_per_second(long tps, const char *context)`
`69`	`68`	`{`
`@@ -75,6 +74,9 @@ check_ticks_per_second(long tps, const char *context)`
`75`	`74`	`}`
`76`	`75`	`return 0;`
`77`	`76`	`}`
	`77`	`+#endif /* HAVE_TIMES \|\| HAVE_CLOCK */`
	`78`	`+`
	`79`	`+#ifdef HAVE_TIMES`
`78`	`80`
`79`	`81`	`# define ticks_per_second _PyRuntime.time.ticks_per_second`
`80`	`82`