about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-06 19:26:19 +0000
committerbors <bors@rust-lang.org>2014-08-06 19:26:19 +0000
commit51e19e750185f60e404412f702f8f2edc7bc1245 (patch)
tree2758cc7e8a6f208de1b72b6ea93e358e98ac1f1d /src/libstd
parentdd20f0961149022505359c27e308d04b06b672a7 (diff)
parentffa258846ad7669a67850da9b1d5fa534e87f04f (diff)
downloadrust-51e19e750185f60e404412f702f8f2edc7bc1245.tar.gz
rust-51e19e750185f60e404412f702f8f2edc7bc1245.zip
auto merge of #16308 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rand/os.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index 60e2c4c8949..ffe8e539ffb 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -136,10 +136,11 @@ mod imp {
     use rand::Rng;
     use result::{Ok, Err};
     use rt::stack;
-    use self::libc::{c_ulong, DWORD, BYTE, LPCSTR, BOOL};
+    use self::libc::{DWORD, BYTE, LPCSTR, BOOL};
+    use self::libc::types::os::arch::extra::{LONG_PTR};
     use slice::MutableVector;
 
-    type HCRYPTPROV = c_ulong;
+    type HCRYPTPROV = LONG_PTR;
 
     /// A random number generator that retrieves randomness straight from
     /// the operating system. Platform sources: