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

Remove MSVC's wmemchr declaration
This commit is contained in:
Yuki Okushi 2020-03-18 19:59:02 +09:00 committed by GitHub
commit 276eaa2d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -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! {

View File

@ -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,