From 6b6eca0631c893c5f8cfb8274cdfe18e2d0637c0 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 14 Aug 2021 19:24:36 +0200
Subject: [PATCH] Kernel+LibC: Share definitions for sys/time.h

---
 Kernel/API/POSIX/sys/time.h        | 22 ++++++++++++++++++++++
 Kernel/UnixTypes.h                 |  9 +--------
 Userland/Libraries/LibC/sys/time.h |  8 +-------
 3 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 Kernel/API/POSIX/sys/time.h

diff --git a/Kernel/API/POSIX/sys/time.h b/Kernel/API/POSIX/sys/time.h
new file mode 100644
index 00000000000..bcb0366f7bc
--- /dev/null
+++ b/Kernel/API/POSIX/sys/time.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <Kernel/API/POSIX/sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct timeval {
+    time_t tv_sec;
+    suseconds_t tv_usec;
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h
index b3af1919fe9..644a722836f 100644
--- a/Kernel/UnixTypes.h
+++ b/Kernel/UnixTypes.h
@@ -22,6 +22,7 @@
 #include <Kernel/API/POSIX/sys/mman.h>
 #include <Kernel/API/POSIX/sys/socket.h>
 #include <Kernel/API/POSIX/sys/stat.h>
+#include <Kernel/API/POSIX/sys/time.h>
 #include <Kernel/API/POSIX/sys/times.h>
 #include <Kernel/API/POSIX/sys/un.h>
 #include <Kernel/API/POSIX/sys/utsname.h>
@@ -51,14 +52,6 @@ typedef u8 __u8;
 typedef int __s32;
 typedef short __s16;
 
-typedef u32 useconds_t;
-typedef i32 suseconds_t;
-
-struct timeval {
-    time_t tv_sec;
-    suseconds_t tv_usec;
-};
-
 struct iovec {
     void* iov_base;
     size_t iov_len;
diff --git a/Userland/Libraries/LibC/sys/time.h b/Userland/Libraries/LibC/sys/time.h
index 7d670bfec83..452774f71c3 100644
--- a/Userland/Libraries/LibC/sys/time.h
+++ b/Userland/Libraries/LibC/sys/time.h
@@ -6,17 +6,11 @@
 
 #pragma once
 
-#include <sys/cdefs.h>
-#include <sys/types.h>
+#include <Kernel/API/POSIX/sys/time.h>
 #include <time.h>
 
 __BEGIN_DECLS
 
-struct timeval {
-    time_t tv_sec;
-    suseconds_t tv_usec;
-};
-
 struct timezone {
     int tz_minuteswest;
     int tz_dsttime;