newlib/libc/include/time.h: Removed clock_id casts

The POSIX specification defines these as constants. The cast is
unnecessary. This brings newlib inline with the equivalent FreeBSD
defines.
This commit is contained in:
Aaron Nyholm 2024-11-20 09:16:50 +11:00 committed by Corinna Vinschen
parent b091b47b9e
commit b8d3dec491
2 changed files with 81 additions and 10 deletions

View File

@ -237,10 +237,10 @@ extern "C" {
/* Manifest Constants, P1003.1b-1993, p. 262 */ /* Manifest Constants, P1003.1b-1993, p. 262 */
#if __GNU_VISIBLE #if __GNU_VISIBLE
#define CLOCK_REALTIME_COARSE ((clockid_t) 0) #define CLOCK_REALTIME_COARSE (0)
#endif #endif
#define CLOCK_REALTIME ((clockid_t) 1) #define CLOCK_REALTIME (1)
/* Manifest Constants, P1003.4b/D8, p. 55 */ /* Manifest Constants, P1003.4b/D8, p. 55 */
@ -250,7 +250,7 @@ extern "C" {
the identifier of the CPU_time clock associated with the PROCESS the identifier of the CPU_time clock associated with the PROCESS
making the function call. */ making the function call. */
#define CLOCK_PROCESS_CPUTIME_ID ((clockid_t) 2) #define CLOCK_PROCESS_CPUTIME_ID (2)
#endif #endif
@ -260,7 +260,7 @@ extern "C" {
the identifier of the CPU_time clock associated with the THREAD the identifier of the CPU_time clock associated with the THREAD
making the function call. */ making the function call. */
#define CLOCK_THREAD_CPUTIME_ID ((clockid_t) 3) #define CLOCK_THREAD_CPUTIME_ID (3)
#endif #endif
@ -270,21 +270,21 @@ extern "C" {
* as a clock whose value cannot be set via clock_settime() and which * as a clock whose value cannot be set via clock_settime() and which
* cannot have backward clock jumps. */ * cannot have backward clock jumps. */
#define CLOCK_MONOTONIC ((clockid_t) 4) #define CLOCK_MONOTONIC (4)
#endif #endif
#if __GNU_VISIBLE #if __GNU_VISIBLE
#define CLOCK_MONOTONIC_RAW ((clockid_t) 5) #define CLOCK_MONOTONIC_RAW (5)
#define CLOCK_MONOTONIC_COARSE ((clockid_t) 6) #define CLOCK_MONOTONIC_COARSE (6)
#define CLOCK_BOOTTIME ((clockid_t) 7) #define CLOCK_BOOTTIME (7)
#define CLOCK_REALTIME_ALARM ((clockid_t) 8) #define CLOCK_REALTIME_ALARM (8)
#define CLOCK_BOOTTIME_ALARM ((clockid_t) 9) #define CLOCK_BOOTTIME_ALARM (9)
#endif #endif

71
test Normal file
View File

@ -0,0 +1,71 @@
From: Aaron Nyholm <aaron.nyholm@unfoldedeffective.com>
---
newlib/libc/include/time.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index ed6cc70fe..ab3491341 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -237,10 +237,10 @@ extern "C" {
/* Manifest Constants, P1003.1b-1993, p. 262 */
#if __GNU_VISIBLE
-#define CLOCK_REALTIME_COARSE ((clockid_t) 0)
+#define CLOCK_REALTIME_COARSE (0)
#endif
-#define CLOCK_REALTIME ((clockid_t) 1)
+#define CLOCK_REALTIME (1)
/* Manifest Constants, P1003.4b/D8, p. 55 */
@@ -250,7 +250,7 @@ extern "C" {
the identifier of the CPU_time clock associated with the PROCESS
making the function call. */
-#define CLOCK_PROCESS_CPUTIME_ID ((clockid_t) 2)
+#define CLOCK_PROCESS_CPUTIME_ID (2)
#endif
@@ -260,7 +260,7 @@ extern "C" {
the identifier of the CPU_time clock associated with the THREAD
making the function call. */
-#define CLOCK_THREAD_CPUTIME_ID ((clockid_t) 3)
+#define CLOCK_THREAD_CPUTIME_ID (3)
#endif
@@ -270,21 +270,21 @@ extern "C" {
* as a clock whose value cannot be set via clock_settime() and which
* cannot have backward clock jumps. */
-#define CLOCK_MONOTONIC ((clockid_t) 4)
+#define CLOCK_MONOTONIC (4)
#endif
#if __GNU_VISIBLE
-#define CLOCK_MONOTONIC_RAW ((clockid_t) 5)
+#define CLOCK_MONOTONIC_RAW (5)
-#define CLOCK_MONOTONIC_COARSE ((clockid_t) 6)
+#define CLOCK_MONOTONIC_COARSE (6)
-#define CLOCK_BOOTTIME ((clockid_t) 7)
+#define CLOCK_BOOTTIME (7)
-#define CLOCK_REALTIME_ALARM ((clockid_t) 8)
+#define CLOCK_REALTIME_ALARM (8)
-#define CLOCK_BOOTTIME_ALARM ((clockid_t) 9)
+#define CLOCK_BOOTTIME_ALARM (9)
#endif
--
2.46.2