Skip to content

Commit ea18049

Browse files
committed
Remove the new extern "C" blocks (merge with existing blocks)
1 parent 54cf8b8 commit ea18049

File tree

5 files changed

+3
-13
lines changed

5 files changed

+3
-13
lines changed

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,9 +1591,7 @@ extern "C" {
15911591
outbytesleft: *mut ::size_t,
15921592
) -> ::size_t;
15931593
pub fn iconv_close(cd: iconv_t) -> ::c_int;
1594-
}
15951594

1596-
extern "C" {
15971595
// Added in `FreeBSD` 11.0
15981596
// Added in `DragonFly BSD` 5.4
15991597
pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2083,9 +2083,7 @@ extern "C" {
20832083
outbytesleft: *mut ::size_t,
20842084
) -> ::size_t;
20852085
pub fn iconv_close(cd: iconv_t) -> ::c_int;
2086-
}
20872086

2088-
extern "C" {
20892087
// Added in `NetBSD` 7.0
20902088
pub fn explicit_memset(b: *mut ::c_void, c: ::c_int, len: ::size_t);
20912089
}

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,9 +1543,7 @@ extern "C" {
15431543
pub fn freelocale(loc: ::locale_t);
15441544
pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
15451545
pub fn duplocale(base: ::locale_t) -> ::locale_t;
1546-
}
15471546

1548-
extern "C" {
15491547
// Added in `OpenBSD` 5.5
15501548
pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
15511549
}

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,9 @@ extern "C" {
12331233
newpath: *const ::c_char,
12341234
flags: ::c_uint,
12351235
) -> ::c_int;
1236+
1237+
// Added in `glibc` 2.25
1238+
pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
12361239
}
12371240

12381241
extern "C" {
@@ -1300,11 +1303,6 @@ extern "C" {
13001303
pub fn dlinfo(handle: *mut ::c_void, request: ::c_int, info: *mut ::c_void) -> ::c_int;
13011304
}
13021305

1303-
extern "C" {
1304-
// Added in `glibc` 2.25
1305-
pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
1306-
}
1307-
13081306
cfg_if! {
13091307
if #[cfg(any(target_arch = "x86",
13101308
target_arch = "arm",

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,7 @@ extern "C" {
697697
path: *const ::c_char,
698698
) -> ::c_int;
699699
pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
700-
}
701700

702-
extern "C" {
703701
// Added in `musl` 1.1.20
704702
pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
705703
}

0 commit comments

Comments
 (0)