[Minios-devel] [PATCH v2 45/47] arm64: fix the compilor error in time

[Huang Shijie <shijie.huang@xxxxxxx>]

We will meet the compilor error when the HAVE_LIBC is not enabled:
  --------------------------------------------------------------------
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 lib/libfdt/libfdt_env.h:57,
                 from lib/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 lib/libfdt/libfdt_env.h:57,
                 from lib/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/lib/libfdt/fdt.o' failed
make: *** [/root/mini-os/lib/libfdt/fdt.o] Error 1
  --------------------------------------------------------------------

This patch changes the libfdt_env.h, and fix the compiler error.

Signed-off-by: Huang Shijie <shijie.huang@xxxxxxx>
---
 lib/libfdt/libfdt_env.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/libfdt/libfdt_env.h b/lib/libfdt/libfdt_env.h
index bd24746..a78d01f 100644
--- a/lib/libfdt/libfdt_env.h
+++ b/lib/libfdt/libfdt_env.h
@@ -54,7 +54,11 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
+#ifdef HAVE_LIBC
 #include <stdlib.h>
+#endif
+
 #include <string.h>
 
 #ifdef __CHECKER__
-- 
2.7.4


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