From 9aed829fe6cdf5eaf278c6c3972f7acd0830887d Mon Sep 17 00:00:00 2001
From: bstrie <865233+bstrie@users.noreply.github.com>
Date: Wed, 2 Mar 2022 13:52:31 -0500
Subject: [PATCH] Re-export core::ffi types from std::ffi

---
 library/std/src/ffi/mod.rs | 9 +++++++++
 library/std/src/lib.rs     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs
index 019b64c395eda..13e3dacc30d63 100644
--- a/library/std/src/ffi/mod.rs
+++ b/library/std/src/ffi/mod.rs
@@ -159,6 +159,15 @@ pub use self::os_str::{OsStr, OsString};
 #[stable(feature = "core_c_void", since = "1.30.0")]
 pub use core::ffi::c_void;
 
+#[unstable(feature = "core_ffi_c", issue = "94501")]
+pub use core::ffi::{
+    c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
+    c_ulong, c_ulonglong, c_ushort,
+};
+
+#[unstable(feature = "c_size_t", issue = "88345")]
+pub use core::ffi::{c_ptrdiff_t, c_size_t, c_ssize_t};
+
 #[unstable(
     feature = "c_variadic",
     reason = "the `c_variadic` feature has not been properly tested on \
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 4603b5aae20b0..10fec8e115245 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -261,6 +261,7 @@
 #![feature(const_socketaddr)]
 #![feature(const_trait_impl)]
 #![feature(container_error_extra)]
+#![feature(c_size_t)]
 #![feature(core_ffi_c)]
 #![feature(core_intrinsics)]
 #![feature(core_panic)]