diff options
author | Rich Felker <dalias@aerifal.cx> | 2013-05-26 18:22:12 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2013-05-26 18:22:12 -0400 |
commit | d9265653552a2b667bf3e84407a06edaa7e9f74f (patch) | |
tree | 2781a8b5385ee8224b4cda826ac159c3b769b995 /include/sys/time.h | |
parent | change underlying type of clock_t to be uniform and match ABI (diff) | |
parent | fix the prototype of settimeofday to follow the original BSD declaration (diff) | |
download | grovel-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.gz grovel-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.xz |
Merge remote-tracking branch 'nsz/review'
Diffstat (limited to 'include/sys/time.h')
-rw-r--r-- | include/sys/time.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/sys/time.h b/include/sys/time.h index 559e817e..3ce824e6 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -30,15 +30,15 @@ int utimes (const char *, const struct timeval [2]); #endif #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -int futimes(int, const struct timeval [2]); -int futimesat(int, const char *, 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; }; +int futimes(int, const struct timeval [2]); +int futimesat(int, const char *, const struct timeval [2]); +int lutimes(const char *, const struct timeval [2]); +int settimeofday(const struct timeval *, const struct timezone *); +int adjtime (const struct timeval *, struct timeval *); #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 ? \ |