improve handling of nonstandard fields in struct tm

[musl] / include / time.h

diff --git a/include/time.h b/include/time.h
index 2f4c74f..09a65cf 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -7,13 +7,7 @@ extern "C" {
 
 #include <features.h>
 
 
 #include <features.h>
 

-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
-
+#define NULL 0L

 
 #define __NEED_size_t
 #define __NEED_time_t
 
 #define __NEED_size_t
 #define __NEED_time_t


@@ -31,6 +25,11 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
 
 #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;
 struct tm
 {
        int tm_sec;