Browse Source

LibC+Kernel: Use an enum for clockid_t values

Andreas Kling 4 years ago
parent
commit
f02d73db4d
2 changed files with 28 additions and 10 deletions
  1. 14 5
      Kernel/UnixTypes.h
  2. 14 5
      Userland/Libraries/LibC/time.h

+ 14 - 5
Kernel/UnixTypes.h

@@ -602,11 +602,20 @@ typedef enum {
 
 
 typedef int clockid_t;
 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 TIMER_ABSTIME 99
 
 
 #define UTSNAME_ENTRY_LEN 65
 #define UTSNAME_ENTRY_LEN 65

+ 14 - 5
Userland/Libraries/LibC/time.h

@@ -52,11 +52,20 @@ struct timespec {
 
 
 typedef int clockid_t;
 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 TIMER_ABSTIME 99
 
 
 int clock_gettime(clockid_t, struct timespec*);
 int clock_gettime(clockid_t, struct timespec*);