X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsys%2Ftime.h;h=144dd230d4015225bd6fb90dc7aa3dbd900362bb;hb=43a5a00e4ab292e0a615b655f1e77837d6c1701e;hp=edaf6af678968f4b3e5fc5801ccda76d1284e93c;hpb=74eea628cf43355ba2b227f0bb3c31697d637761;p=musl

diff --git a/include/sys/time.h b/include/sys/time.h
index edaf6af6..144dd230 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -4,23 +4,12 @@
 extern "C" {
 #endif
 
-/* All symbols from select.h except pselect are required anyway... */
 #include <sys/select.h>
 
-#define __NEED_time_t
-#define __NEED_suseconds_t
-#define __NEED_struct_timeval
-
-#include <bits/alltypes.h>
-
-
-
 int gettimeofday (struct timeval *, void *);
 
-/* extensions */
-int settimeofday (const struct timeval *, void *);
-int adjtime (const struct timeval *, struct timeval *);
-
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
 
 #define ITIMER_REAL    0
 #define ITIMER_VIRTUAL 1
@@ -36,11 +25,27 @@ int getitimer (int, struct itimerval *);
 int setitimer (int, const struct itimerval *, struct itimerval *);
 int utimes (const char *, const struct timeval [2]);
 
-#ifdef _GNU_SOURCE
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int futimes(int, const struct timeval [2]);
+int lutimes(const char *, const struct timeval [2]);
+int settimeofday (const struct timeval *, void *);
+int adjtime (const struct timeval *, struct timeval *);
 struct timezone {
 	int tz_minuteswest;
 	int tz_dsttime;
 };
+#define timerisset(t) ((t)->tv_sec || (t)->tv_usec)
+#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, \
+	((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, \
+	((a)->tv_usec = (s)->tv_usec - (t)->tv_usec) < 0 && \
+	((a)->tv_usec += 1000000, (a)->tv_sec--) )
 #endif
 
 #ifdef __cplusplus