about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Richardson <corey@octayn.net>2014-08-14 15:18:14 -0400
committerCorey Richardson <corey@octayn.net>2014-08-20 21:02:24 -0400
commit2dc2ac1e6b382b8c658071f61c3f95ae444dcc16 (patch)
tree6da6e648ec0fd760354cdcb235fbd7edb5a35c14 /src/libstd
parent0cffa32c21b08cec443dd2d0388e39cf381b6bfc (diff)
downloadrust-2dc2ac1e6b382b8c658071f61c3f95ae444dcc16.tar.gz
rust-2dc2ac1e6b382b8c658071f61c3f95ae444dcc16.zip
liblibc: don't use int/uint for intptr_t/uintptr_t
int/uint aren't considered FFI safe, replace them with the actual type they
represent (i64/u64 or i32/u32). This is a breaking change, but at most a cast
to `uint` or `int` needs to be added.

[breaking-change]
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index d8eb0979190..7780c61e866 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -59,7 +59,7 @@ use libc::c_char;
 /// Get the number of cores available
 pub fn num_cpus() -> uint {
     unsafe {
-        return rust_get_num_cpus();
+        return rust_get_num_cpus() as uint;
     }
 
     extern {