X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsys%2Ftime.h;h=c5cab814c0d112d493d75d1a35c98bb338195687;hb=f3b6690a53c81a869173bbdce701972c952a4e82;hp=3ce824e63db0158eb600b272ecefac7e0ad3ffd6;hpb=31ff797787d89bc01a69ca672fb2340ff21a827e;p=musl

diff --git a/include/sys/time.h b/include/sys/time.h
index 3ce824e6..c5cab814 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -10,15 +10,11 @@ extern "C" {
 
 int gettimeofday (struct timeval *__restrict, void *__restrict);
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
 #define ITIMER_REAL    0
 #define ITIMER_VIRTUAL 1
 #define ITIMER_PROF    2
 
-struct itimerval
-{
+struct itimerval {
 	struct timeval it_interval;
 	struct timeval it_value;
 };
@@ -27,8 +23,6 @@ int getitimer (int, struct itimerval *);
 int setitimer (int, const struct itimerval *__restrict, struct itimerval *__restrict);
 int utimes (const char *, const struct timeval [2]);
 
-#endif
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 struct timezone {
 	int tz_minuteswest;
@@ -43,14 +37,25 @@ int adjtime (const struct timeval *, struct timeval *);
 #define timerclear(t) ((t)->tv_sec = (t)->tv_usec = 0)
 #define timercmp(s,t,op) ((s)->tv_sec == (t)->tv_sec ? \
 	(s)->tv_usec op (t)->tv_usec : (s)->tv_sec op (t)->tv_sec)
-#define timeradd(s,t,a) ( (a)->tv_sec = (s)->tv_sec + (t)->tv_sec, \
+#define timeradd(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec + (t)->tv_sec, \
 	((a)->tv_usec = (s)->tv_usec + (t)->tv_usec) >= 1000000 && \
 	((a)->tv_usec -= 1000000, (a)->tv_sec++) )
-#define timersub(s,t,a) ( (a)->tv_sec = (s)->tv_sec - (t)->tv_sec, \
+#define timersub(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec - (t)->tv_sec, \
 	((a)->tv_usec = (s)->tv_usec - (t)->tv_usec) < 0 && \
 	((a)->tv_usec += 1000000, (a)->tv_sec--) )
 #endif
 
+#if defined(_GNU_SOURCE)
+#define TIMEVAL_TO_TIMESPEC(tv, ts) ( \
+	(ts)->tv_sec = (tv)->tv_sec, \
+	(ts)->tv_nsec = (tv)->tv_usec * 1000, \
+	(void)0 )
+#define TIMESPEC_TO_TIMEVAL(tv, ts) ( \
+	(tv)->tv_sec = (ts)->tv_sec, \
+	(tv)->tv_usec = (ts)->tv_nsec / 1000, \
+	(void)0 )
+#endif
+
 #ifdef __cplusplus
 }
 #endif