From ba776390b5878ec0be1a9e595a3471a6cfe0a0cf Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Tue, 8 Aug 2023 21:57:35 +0200
Subject: [PATCH] LibC: Define `time*` macros before definitions

Otherwise, if an application defines its own macros, the implementations
get messed up. This way we redefine those macros if they're set.

This fixes the PHP port build.
---
 Userland/Libraries/LibC/sys/time.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Userland/Libraries/LibC/sys/time.h b/Userland/Libraries/LibC/sys/time.h
index 7dfa189104..e98ff48d65 100644
--- a/Userland/Libraries/LibC/sys/time.h
+++ b/Userland/Libraries/LibC/sys/time.h
@@ -28,6 +28,13 @@ int utimes(char const* pathname, struct timeval const times[2]);
 int lutimes(char const* pathname, struct timeval const times[2]);
 int futimes(int fd, struct timeval const times[2]);
 
+#define timeradd timeradd
+#define timersub timersub
+#define timerclear timerclear
+#define timerisset timerisset
+#define timercmp(tvp, uvp, cmp) \
+    (((tvp)->tv_sec == (uvp)->tv_sec) ? ((tvp)->tv_usec cmp(uvp)->tv_usec) : ((tvp)->tv_sec cmp(uvp)->tv_sec))
+
 static inline void timeradd(const struct timeval* a, const struct timeval* b, struct timeval* out)
 {
     out->tv_sec = a->tv_sec + b->tv_sec;
@@ -58,12 +65,12 @@ static inline int timerisset(const struct timeval* tv)
     return tv->tv_sec || tv->tv_usec;
 }
 
-#define timeradd timeradd
-#define timersub timersub
-#define timerclear timerclear
-#define timerisset timerisset
-#define timercmp(tvp, uvp, cmp) \
-    (((tvp)->tv_sec == (uvp)->tv_sec) ? ((tvp)->tv_usec cmp(uvp)->tv_usec) : ((tvp)->tv_sec cmp(uvp)->tv_sec))
+#define timespecadd timespecadd
+#define timespecsub timespecsub
+#define timespecclear timespecclear
+#define timespecisset timespecisset
+#define timespeccmp(ts, us, cmp) \
+    (((ts)->tv_sec == (us)->tv_sec) ? ((ts)->tv_nsec cmp(us)->tv_nsec) : ((ts)->tv_sec cmp(us)->tv_sec))
 
 static inline void timespecadd(const struct timespec* a, const struct timespec* b, struct timespec* out)
 {
@@ -107,11 +114,4 @@ static inline void TIMESPEC_TO_TIMEVAL(struct timeval* tv, const struct timespec
     tv->tv_usec = ts->tv_nsec / 1000;
 }
 
-#define timespecadd timespecadd
-#define timespecsub timespecsub
-#define timespecclear timespecclear
-#define timespecisset timespecisset
-#define timespeccmp(ts, us, cmp) \
-    (((ts)->tv_sec == (us)->tv_sec) ? ((ts)->tv_nsec cmp(us)->tv_nsec) : ((ts)->tv_sec cmp(us)->tv_sec))
-
 __END_DECLS