summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-04 10:00:05 -0700
committerGitHub <noreply@github.com>2016-10-04 10:00:05 -0700
commit68abfade9faf63e57d5cc924141475edbe8e7899 (patch)
treed5db06b367e7dce4de3a7e3106924df7f7f32553
parented16fe6d87df9b90808bc9e180f4e050994954bf (diff)
parente8155ba221f37158f6f755d0da1ce275e7438cd3 (diff)
downloadrust-libc-68abfade9faf63e57d5cc924141475edbe8e7899.tar.gz
Auto merge of #415 - kallisti5:master, r=alexcrichton
Haiku: Add in missing build-time types, fix module usage Working through the few final remaining build issues for the Haiku target.
-rw-r--r--src/unix/haiku/mod.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
index 071f909c6c..8425f728c3 100644
--- a/src/unix/haiku/mod.rs
+++ b/src/unix/haiku/mod.rs
@@ -26,6 +26,7 @@ pub type sigset_t = u64;
pub type fsblkcnt_t = i64;
pub type fsfilcnt_t = i64;
pub type pthread_attr_t = *mut ::c_void;
+pub type nl_item = ::c_int;
pub enum timezone {}
@@ -704,7 +705,9 @@ extern {
cfg_if! {
if #[cfg(target_pointer_width = "64")] {
mod b64;
+ pub use self::b64::*;
} else {
mod b32;
+ pub use self::b32::*;
}
}