Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 0 deletions

diff --git a/vendor/rustix-0.36.5/src/ffi/mod.rs b/vendor/rustix-0.36.5/src/ffi/mod.rs
new file mode 100644
index 000000000..eb9983610
--- /dev/null
+++ b/vendor/rustix-0.36.5/src/ffi/mod.rs
@@ -0,0 +1,16 @@
+//! Utilities related to FFI bindings.
+
+// If we have std, use it.
+#[cfg(feature = "std")]
+pub use {
+    std::ffi::{CStr, CString, FromBytesWithNulError, NulError},
+    std::os::raw::c_char,
+};
+
+// If we don't have std, we can depend on core and alloc having these features
+// in new versions of Rust.
+#[cfg(not(feature = "std"))]
+pub use {
+    alloc::ffi::{CString, NulError},
+    core::ffi::{c_char, CStr, FromBytesWithNulError},
+};