From 31ff797787d89bc01a69ca672fb2340ff21a827e Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 26 May 2013 16:01:38 +0000 Subject: fix the prototype of settimeofday to follow the original BSD declaration --- include/sys/time.h | 10 +++++----- src/linux/settimeofday.c | 3 ++- 2 files changed, 7 insertions(+), 6 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 ? \ diff --git a/src/linux/settimeofday.c b/src/linux/settimeofday.c index d741f66b..15c18c63 100644 --- a/src/linux/settimeofday.c +++ b/src/linux/settimeofday.c @@ -1,7 +1,8 @@ +#define _BSD_SOURCE #include #include "syscall.h" -int settimeofday(const struct timeval *tv, void *tz) +int settimeofday(const struct timeval *tv, const struct timezone *tz) { return syscall(SYS_settimeofday, tv, 0); } -- cgit 1.4.1