[Minios-devel] [PATCH 18/40] mini-os: fix the compilor error in time

[Huang Shijie <shijie.huang@xxxxxxx>]

In file included from /usr/include/aarch64-linux-gnu/sys/select.h:45:0,
                 from /usr/include/aarch64-linux-gnu/sys/types.h:219,
                 from /usr/include/stdlib.h:314,
                 from dtc/libfdt/libfdt_env.h:57,
                 from dtc/libfdt/fdt.c:51:
/usr/include/aarch64-linux-gnu/bits/time.h:30:8: error: redefinition of ‘struct 
timeval’
 struct timeval
        ^
In file included from /root/mini-os/include/time.h:49:0,
                 from /usr/include/aarch64-linux-gnu/sys/types.h:132,
                 from /usr/include/stdlib.h:314,
                 from dtc/libfdt/libfdt_env.h:57,
                 from dtc/libfdt/fdt.c:51:
/root/mini-os/include/sys/time.h:35:8: note: originally defined here
 struct timeval {
        ^
minios.mk:68: recipe for target '/root/mini-os/dtc/lib

Change-Id: I2269cd07f8fc921c7ae349546440ef5b282c0b50
Jira: ENTOS-247
Signed-off-by: Huang Shijie <shijie.huang@xxxxxxx>
---
 include/sys/time.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/sys/time.h b/include/sys/time.h
index 3be3653..2310e55 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -24,6 +24,9 @@
 #include_next <sys/time.h>
 
 #else
+
+#ifndef _STRUCT_TIMEVAL
+#define _STRUCT_TIMEVAL        1
 struct timespec {
     time_t      tv_sec;
     long        tv_nsec;
@@ -38,6 +41,7 @@ struct timeval {
 };
 
 int      gettimeofday(struct timeval *tv, void *tz);
+#endif
 
 #endif
 #ifdef HAVE_LIBC
-- 
2.7.4


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/minios-devel