improve handling of nonstandard fields in struct tm

[musl] / include / time.h

diff --git a/include/time.h b/include/time.h
index f24789e..09a65cf 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -5,19 +5,9 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
-
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#include <features.h>
 
+#define NULL 0L
 
 #define __NEED_size_t
 #define __NEED_time_t
@@ -35,6 +25,11 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define __tm_gmtoff tm_gmtoff
+#define __tm_zone tm_zone
+#endif
+
 struct tm
 {
        int tm_sec;