X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Ftime.h;h=aa4efff495cb193b2c6780a110f54c5327cda31e;hp=2f4c74f73ecccc6a1bd2674aff39a3b0b5ef65a1;hb=1ab59de81e94e7802f85d314a709f8350a0e9b65;hpb=c1a9658bd19245ff0fb52d3da567815d822fb622

diff --git a/include/time.h b/include/time.h
index 2f4c74f7..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,6 +39,10 @@ struct tm
 	long __tm_gmtoff;
 	const char *__tm_zone;
 };
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define tm_gmtoff __tm_gmtoff
+#define tm_zone __tm_zone
+#endif
 
 clock_t clock (void);
 time_t time (time_t *);