[Minios-devel] [UNIKRAFT v2 1/8] lib/uktime: Adapt time.h to Unikraft

[Costin Lupu <costin.lupu@xxxxxxxxx>]

The contents of this header were disabled until now because we were using the
definitions of newlib and the build with nolibc was failing.

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 lib/uktime/musl-imported/include/time.h | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/lib/uktime/musl-imported/include/time.h 
b/lib/uktime/musl-imported/include/time.h
index f30f5226..9a90d1e5 100644
--- a/lib/uktime/musl-imported/include/time.h
+++ b/lib/uktime/musl-imported/include/time.h
@@ -5,31 +5,16 @@
 extern "C" {
 #endif
 
-#if 0
-#include <features.h>
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-
 #define __NEED_size_t
 #define __NEED_time_t
 #define __NEED_clock_t
 #define __NEED_struct_timespec
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
 #define __NEED_clockid_t
 #define __NEED_timer_t
 #define __NEED_pid_t
 #define __NEED_locale_t
-#endif
 
-#include <bits/alltypes.h>
+#include <sys/types.h>
 
 #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define __tm_gmtoff tm_gmtoff
@@ -65,10 +50,6 @@ int timespec_get(struct timespec *, int);
 
 #define TIME_UTC 1
 
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
 size_t strftime_l (char *  __restrict, size_t, const char *  __restrict, const 
struct tm *  __restrict, locale_t);
 
 struct tm *gmtime_r (const time_t *__restrict, struct tm *__restrict);
@@ -114,9 +95,6 @@ int timer_getoverrun (timer_t);
 
 extern char *tzname[2];
 
-#endif
-
-
 #if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 char *strptime (const char *__restrict, const char *__restrict, struct tm 
*__restrict);
 extern int daylight;
@@ -124,7 +102,6 @@ extern long timezone;
 extern int getdate_err;
 struct tm *getdate (const char *);
 #endif
-#endif
 
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-- 
2.20.1


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