about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2013-05-26 16:01:38 +0000
committerSzabolcs Nagy <nsz@port70.net>2013-05-26 16:01:38 +0000
commit31ff797787d89bc01a69ca672fb2340ff21a827e (patch)
tree5b6c227760d96d96d57dd530bcde40e59a8eb02f
parent41c34d188a598b016d62e152735f8466fe9910a4 (diff)
downloadmusl-31ff797787d89bc01a69ca672fb2340ff21a827e.tar.gz
musl-31ff797787d89bc01a69ca672fb2340ff21a827e.tar.xz
musl-31ff797787d89bc01a69ca672fb2340ff21a827e.zip
fix the prototype of settimeofday to follow the original BSD declaration
-rw-r--r--include/sys/time.h10
-rw-r--r--src/linux/settimeofday.c3
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 <sys/time.h>
 #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);
 }