From f02d73db4dd331f463694b77bb2838f92f2aa572 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 10 Aug 2021 12:56:09 +0200 Subject: [PATCH] LibC+Kernel: Use an enum for clockid_t values --- Kernel/UnixTypes.h | 19 ++++++++++++++----- Userland/Libraries/LibC/time.h | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h index 2207b22f1e..44a3351a8a 100644 --- a/Kernel/UnixTypes.h +++ b/Kernel/UnixTypes.h @@ -602,11 +602,20 @@ typedef enum { typedef int clockid_t; -#define CLOCK_REALTIME 0 -#define CLOCK_MONOTONIC 1 -#define CLOCK_MONOTONIC_RAW 4 -#define CLOCK_REALTIME_COARSE 5 -#define CLOCK_MONOTONIC_COARSE 6 +enum { + CLOCK_REALTIME, +#define CLOCK_REALTIME CLOCK_REALTIME + CLOCK_MONOTONIC, +#define CLOCK_MONOTONIC CLOCK_MONOTONIC + CLOCK_MONOTONIC_RAW, +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_RAW + CLOCK_REALTIME_COARSE, +#define CLOCK_REALTIME_COARSE CLOCK_REALTIME_COARSE + CLOCK_MONOTONIC_COARSE, +#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_COARSE + CLOCK_ID_COUNT, +}; + #define TIMER_ABSTIME 99 #define UTSNAME_ENTRY_LEN 65 diff --git a/Userland/Libraries/LibC/time.h b/Userland/Libraries/LibC/time.h index 13f25bee9a..ed65fb2e37 100644 --- a/Userland/Libraries/LibC/time.h +++ b/Userland/Libraries/LibC/time.h @@ -52,11 +52,20 @@ struct timespec { typedef int clockid_t; -#define CLOCK_REALTIME 0 -#define CLOCK_MONOTONIC 1 -#define CLOCK_MONOTONIC_RAW 4 -#define CLOCK_REALTIME_COARSE 5 -#define CLOCK_MONOTONIC_COARSE 6 +enum { + CLOCK_REALTIME, +#define CLOCK_REALTIME CLOCK_REALTIME + CLOCK_MONOTONIC, +#define CLOCK_MONOTONIC CLOCK_MONOTONIC + CLOCK_MONOTONIC_RAW, +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_RAW + CLOCK_REALTIME_COARSE, +#define CLOCK_REALTIME_COARSE CLOCK_REALTIME_COARSE + CLOCK_MONOTONIC_COARSE, +#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_COARSE + CLOCK_ID_COUNT, +}; + #define TIMER_ABSTIME 99 int clock_gettime(clockid_t, struct timespec*);