Skip to content

Commit aea752a

Browse files
joshtripletttgross35
authored andcommitted
Require rust >= 1.30 and drop libc_core_cvoid conditional
Move the `c_void` re-export to the top-level `lib.rs`. (apply <#4060> to `main`) (cherry picked from commit e221887)
1 parent 60c9510 commit aea752a

File tree

12 files changed

+4173
-20
lines changed

12 files changed

+4173
-20
lines changed

src/fuchsia/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
//! More functions and definitions can be found in the more specific modules
44
//! according to the platform in question.
55
6+
use c_void;
7+
68
// PUB_TYPE
79

810
pub type c_schar = i8;
@@ -4486,5 +4488,3 @@ cfg_if! {
44864488
// Unknown target_arch
44874489
}
44884490
}
4489-
4490-
pub use ffi::c_void;

src/hermit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//! Hermit C type definitions
22
3+
use c_void;
4+
35
cfg_if! {
46
if #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))] {
57
pub type c_char = u8;
@@ -576,5 +578,3 @@ extern "C" {
576578
#[link_name = "sys_poll"]
577579
pub fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: i32) -> i32;
578580
}
579-
580-
pub use ffi::c_void;

src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ use core::num;
6161
#[allow(unused_imports)]
6262
use core::option::Option;
6363

64+
pub use core::ffi::c_void;
65+
6466
cfg_if! {
6567
if #[cfg(windows)] {
6668
mod fixed_width_ints;

0 commit comments

Comments
 (0)