X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Ftime.h;h=aa4efff495cb193b2c6780a110f54c5327cda31e;hp=fbc47db90e7cf5f62225f8ecf4d78ad7c46263fa;hb=43653c1250ad5eb5385d7e08292ad047420f8d25;hpb=87781ac64ce5fcd68fb2cf32a3b4305a807e6367

diff --git a/include/time.h b/include/time.h
index fbc47db9..aa4efff4 100644
--- a/include/time.h
+++ b/include/time.h
@@ -7,13 +7,7 @@ extern "C" {
 
 #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
@@ -45,7 +39,7 @@ struct tm
 	long __tm_gmtoff;
 	const char *__tm_zone;
 };
-#if defined(_BSD_SOURCE)
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define tm_gmtoff __tm_gmtoff
 #define tm_zone __tm_zone
 #endif