diff options
| author | bors <bors@rust-lang.org> | 2014-08-23 09:55:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-23 09:55:52 +0000 |
| commit | f66fd2eed10de2acacd8af73c704bf4d140410bb (patch) | |
| tree | 83e0d9b4f78fb3ce546e92d57036fa3a5e86993a | |
| parent | a2842407839f0a98283394d03c794d9bd5372c89 (diff) | |
| parent | 119f8b46948643176f07055be8b81fc48d957614 (diff) | |
| download | rust-f66fd2eed10de2acacd8af73c704bf4d140410bb.tar.gz rust-f66fd2eed10de2acacd8af73c704bf4d140410bb.zip | |
auto merge of #16692 : vadimcn/rust/fix-win64, r=luqmana
This fixes fallout from 2dc2ac1e6b382b8c658071f61c3f95ae444dcc16, which did not take into account win64.
| -rw-r--r-- | src/liblibc/lib.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 859a2bce972..d48d8676027 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -1357,8 +1357,16 @@ pub mod types { pub mod c99 { pub type c_longlong = i64; pub type c_ulonglong = u64; + + #[cfg(target_arch = "x86")] pub type intptr_t = i32; + #[cfg(target_arch = "x86_64")] + pub type intptr_t = i64; + + #[cfg(target_arch = "x86")] pub type uintptr_t = u32; + #[cfg(target_arch = "x86_64")] + pub type uintptr_t = u64; } pub mod posix88 { |