Merge pull request rust-lang#5 from bluss/libc-024

Use memrchr definition from libc
jdm · Dec 21, 2015 · 3cbe589 · 3cbe589
2 parents 62c2a51 + 4b10f07
commit 3cbe589
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ license = "Unlicense/MIT"
 name = "memchr"
 
 [dependencies]
-libc = "0.2"
+libc = "0.2.4"
 
 [dev-dependencies]
 quickcheck = "0.2"
diff --git a/src/lib.rs b/src/lib.rs
@@ -84,7 +84,7 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
         // GNU's memrchr() will - unlike memchr() - error if haystack is empty.
         if haystack.is_empty() {return None}
         let p = unsafe {
-            ffi::memrchr(
+            libc::memrchr(
                 haystack.as_ptr() as *const c_void,
                 needle as c_int,
                 haystack.len() as size_t)
@@ -253,15 +253,6 @@ mod fallback {
     }
 }
 
-#[cfg(target_os = "linux")]
-mod ffi {
-    use libc::c_void;
-    use libc::{c_int, size_t};
-    extern {
-        pub fn memrchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
-    }
-}
-
 #[cfg(test)]
 mod tests {
     extern crate quickcheck;