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

diff --git a/include/time.h b/include/time.h
index fbc47db9..6b2a0693 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
@@ -31,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;
@@ -45,10 +44,6 @@ struct tm
 	long __tm_gmtoff;
 	const char *__tm_zone;
 };
-#if defined(_BSD_SOURCE)
-#define tm_gmtoff __tm_gmtoff
-#define tm_zone __tm_zone
-#endif
 
 clock_t clock (void);
 time_t time (time_t *);
@@ -60,7 +55,7 @@ struct tm *localtime (const time_t *);
 char *asctime (const struct tm *);
 char *ctime (const time_t *);
 
-#define CLOCKS_PER_SEC 1000000UL
+#define CLOCKS_PER_SEC 1000000L
 
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
@@ -86,6 +81,14 @@ struct itimerspec
 #define CLOCK_MONOTONIC          1
 #define CLOCK_PROCESS_CPUTIME_ID 2
 #define CLOCK_THREAD_CPUTIME_ID  3
+#define CLOCK_MONOTONIC_RAW      4
+#define CLOCK_REALTIME_COURSE    5
+#define CLOCK_MONOTONIC_COURSE   6
+#define CLOCK_BOOTTIME           7
+#define CLOCK_REALTIME_ALARM     8
+#define CLOCK_BOOTTIME_ALARM     9
+#define CLOCK_SGI_CYCLE         10
+#define CLOCK_TAI               11
 
 #define TIMER_ABSTIME 1