Moved inotify_rm_watch out of the generic notbsd target and into specific linux and android targets because the second argument has a different type in android and linux.

libc-test/build.rs

@@ -153,7 +153,6 @@ fn do_ctest() {
         cfg.header("xlocale.h");
         cfg.header("utmp.h");
         cfg.header("ifaddrs.h");
-        cfg.header("sys/inotify.h");
         if i686 || x86_64 {
             cfg.header("sys/reg.h");
         }
@@ -263,7 +262,6 @@ fn do_ctest() {
         cfg.header("sys/personality.h");
         cfg.header("sys/swap.h");
         cfg.header("pty.h");
-        cfg.header("sys/inotify.h");
         if !uclibc {
             cfg.header("sys/sysinfo.h");
         }

src/unix/notbsd/android/mod.rs

@@ -1954,6 +1954,7 @@ extern {
                           f: extern fn(*mut ::c_void) -> *mut ::c_void,
                           value: *mut ::c_void) -> ::c_int;
     pub fn __errno() -> *mut ::c_int;
+    pub fn inotify_rm_watch(fd: ::c_int, wd: ::uint32_t) -> ::c_int;
 }
 
 cfg_if! {

src/unix/notbsd/linux/mod.rs

@@ -2291,6 +2291,7 @@ extern {
         nobj: ::size_t,
         stream: *mut ::FILE
     ) -> ::size_t;
+    pub fn inotify_rm_watch(fd: ::c_int, wd: ::c_int) -> ::c_int;
 }
 
 cfg_if! {

src/unix/notbsd/mod.rs

@@ -1425,7 +1425,6 @@ extern {
     pub fn inotify_add_watch(fd: ::c_int,
                              path: *const ::c_char,
                              mask: ::uint32_t) -> ::c_int;
-    pub fn inotify_rm_watch(fd: ::c_int, wd: ::c_int) -> ::c_int;
 }
 
 cfg_if! {