From 2cbc3c6ee5bd97cd2bc7110240b0b73badb07076 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Fri, 27 Dec 2019 23:07:28 +0100
Subject: [PATCH] LibC+ping: Let's use the traditional timersub() et al
 prototypes

This also fixes the build, since ping.cpp already had a timersub().
---
 Libraries/LibC/sys/time.h | 32 ++++++++++++++++----------------
 Userland/ping.cpp         | 10 ----------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/Libraries/LibC/sys/time.h b/Libraries/LibC/sys/time.h
index 28b8a242dd..71a7acee75 100644
--- a/Libraries/LibC/sys/time.h
+++ b/Libraries/LibC/sys/time.h
@@ -9,23 +9,23 @@ __BEGIN_DECLS
 #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
 #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 timeradd(tvp, uvp)                \
-    do {                                  \
-        (tvp)->tv_sec += (uvp)->tv_sec;   \
-        (tvp)->tv_usec += (uvp)->tv_usec; \
-        if ((tvp)->tv_usec >= 1000000) {  \
-            (tvp)->tv_sec++;              \
-            (tvp)->tv_usec -= 1000000;    \
-        }                                 \
+#define timeradd(a, b, out)                           \
+    do {                                              \
+        (out)->tv_sec = (a)->tv_sec + (b)->tv_sec;    \
+        (out)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
+        if ((out)->tv_usec >= 1000000) {              \
+            (out)->tv_sec++;                          \
+            (out)->tv_usec -= 1000000;                \
+        }                                             \
     } while (0)
-#define timersub(tvp, uvp)                \
-    do {                                  \
-        (tvp)->tv_sec -= (uvp)->tv_sec;   \
-        (tvp)->tv_usec -= (uvp)->tv_usec; \
-        if ((tvp)->tv_usec < 0) {         \
-            (tvp)->tv_sec--;              \
-            (tvp)->tv_usec += 1000000;    \
-        }                                 \
+#define timersub(a, b, out)                           \
+    do {                                              \
+        (out)->tv_sec = (a)->tv_sec - (b)->tv_sec;    \
+        (out)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+        if ((out)->tv_usec < 0) {                     \
+            (out)->tv_sec--;                          \
+            (out)->tv_usec += 1000000;                \
+        }                                             \
     } while (0)
 
 struct timeval {
diff --git a/Userland/ping.cpp b/Userland/ping.cpp
index 9151c0df72..a05a07c347 100644
--- a/Userland/ping.cpp
+++ b/Userland/ping.cpp
@@ -24,16 +24,6 @@ uint16_t internet_checksum(const void* ptr, size_t count)
     return htons(~checksum);
 }
 
-inline void timersub(struct timeval* a, struct timeval* b, struct timeval* result)
-{
-    result->tv_sec = a->tv_sec - b->tv_sec;
-    result->tv_usec = a->tv_usec - b->tv_usec;
-    if (result->tv_usec < 0) {
-        --result->tv_sec;
-        result->tv_usec += 1000000;
-    }
-}
-
 int main(int argc, char** argv)
 {
     if (argc != 2) {