Merge pull request #1698 from lzutao/non-msvc-wmemchr

Remove MSVC's wmemchr declaration
rust-lang · Mar 18, 2020 · 276eaa2 · 276eaa2
2 parents 39f43b5 + 0327cc0
commit 276eaa2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/windows/gnu/mod.rs b/src/windows/gnu/mod.rs
@@ -13,6 +13,14 @@ extern "C" {
         s2: *const ::c_char,
         n: ::size_t,
     ) -> ::c_int;
+
+    // NOTE: For MSVC target, `wmemchr` is only a inline function in `<wchar.h>`
+    //      header file. We cannot find a way to link to that symbol from Rust.
+    pub fn wmemchr(
+        cx: *const ::wchar_t,
+        c: ::wchar_t,
+        n: ::size_t,
+    ) -> *mut ::wchar_t;
 }
 
 cfg_if! {

diff --git a/src/windows/mod.rs b/src/windows/mod.rs
@@ -378,7 +378,6 @@ extern "C" {
     ) -> ::size_t;
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
-    pub fn wmemchr(cx: *const wchar_t, c: wchar_t, n: size_t) -> *mut wchar_t;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
     pub fn memcpy(
         dest: *mut c_void,