fixup: merge dragonflybsd/freebsd; fix argument type on linux

Author: gnzlbg

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -1008,8 +1008,6 @@ f! {
 }
 
 extern {
-    pub fn gettimeofday(tp: *mut ::timeval,
-                        tz: *mut ::timezone) -> ::c_int;
     pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
                     -> ::c_int;
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;

src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -1249,8 +1249,6 @@ f! {
 }
 
 extern {
-    pub fn gettimeofday(tp: *mut ::timeval,
-                        tz: *mut ::timezone) -> ::c_int;
     pub fn __error() -> *mut ::c_int;
 
     pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int)

src/unix/bsd/freebsdlike/mod.rs

@@ -1095,7 +1095,8 @@ extern {
                     -> ::c_int;
 
     pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
-
+    pub fn gettimeofday(tp: *mut ::timeval,
+                        tz: *mut ::timezone) -> ::c_int;
     pub fn accept4(s: ::c_int, addr: *mut ::sockaddr,
                    addrlen: *mut ::socklen_t, flags: ::c_int) -> ::c_int;
     pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;

src/unix/notbsd/linux/other/mod.rs

@@ -917,7 +917,7 @@ extern {
     pub fn getpt() -> ::c_int;
     pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int;
     pub fn gettimeofday(tp: *mut ::timeval,
-                        tz: *mut ::c_void) -> ::c_int;
+                        tz: *mut ::timezone) -> ::c_int;
 }
 
 #[link(name = "util")]