From aca39921de81aec4cc8b535a36deab3840eee2fc Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <isaku.yamahata@gmail.com>
Date: Tue, 2 Oct 2018 16:39:31 -0700
Subject: [PATCH] shim_types.h: __kernel_timespec, __kernel_itimerspec

From Linux 4.18.0, it's defined int uapi/time.h.
This patch makes it compile with Linux 4.18.0 or later.

Signed-off-by: Isaku Yamahata <isaku.yamahata@gmail.com>
---
 LibOS/shim/include/shim_types.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/LibOS/shim/include/shim_types.h b/LibOS/shim/include/shim_types.h
index fe9d9e3c..5da2d0df 100644
--- a/LibOS/shim/include/shim_types.h
+++ b/LibOS/shim/include/shim_types.h
@@ -22,6 +22,7 @@
 #include <linux/aio_abi.h>
 #include <linux/perf_event.h>
 #include <linux/timex.h>
+#include <linux/version.h>
 
 #include <asm/posix_types.h>
 #include <asm/statfs.h>
@@ -48,20 +49,22 @@ typedef __kernel_timer_t    timer_t;
 typedef __kernel_fd_set     fd_set;
 
 /* linux/time.h */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
 struct __kernel_timespec {
     __kernel_time_t tv_sec;         /* seconds */
     long            tv_nsec;        /* nanoseconds */
 };
 
-struct __kernel_timeval {
-    __kernel_time_t         tv_sec;         /* seconds */
-    __kernel_suseconds_t    tv_usec;        /* microsecond */
-};
-
 struct __kernel_itimerspec {
     struct __kernel_timespec it_interval;    /* timer period */
     struct __kernel_timespec it_value;       /* timer expiration */
 };
+#endif
+
+struct __kernel_timeval {
+    __kernel_time_t         tv_sec;         /* seconds */
+    __kernel_suseconds_t    tv_usec;        /* microsecond */
+};
 
 struct __kernel_itimerval {
     struct __kernel_timeval it_interval;     /* time interval */