These ones conflict with linux/time.h when building, so better take
them from there directly.
[This is nolibc's upstream commit dc45f5426b0c]

Signed-off-by: Willy Tarreau <w...@1wt.eu>
---
 tools/include/nolibc/nolibc.h | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index 833693faf53c..611d9d15899d 100644
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -94,6 +94,7 @@
 #include <asm/errno.h>
 #include <linux/fs.h>
 #include <linux/loop.h>
+#include <linux/time.h>
 
 #define NOLIBC
 
@@ -152,24 +153,6 @@ struct pollfd {
        short int revents;
 };
 
-/* for select() */
-struct timeval {
-       long    tv_sec;
-       long    tv_usec;
-};
-
-/* for pselect() */
-struct timespec {
-       long    tv_sec;
-       long    tv_nsec;
-};
-
-/* for gettimeofday() */
-struct timezone {
-       int tz_minuteswest;
-       int tz_dsttime;
-};
-
 /* for getdents64() */
 struct linux_dirent64 {
        uint64_t       d_ino;
-- 
2.28.0

Reply via email to