diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:23:27 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 10:32:56 -0800 |
| commit | 4ffde0814f43076c944f46890e0b6d401de92ca4 (patch) | |
| tree | 4b1c7d0612d0901a4746724b103d61ef2a7cee0a /src/libstd/sys | |
| parent | 9c999c797c12f3f79482f0f4f416567b6bcc2a63 (diff) | |
| download | rust-4ffde0814f43076c944f46890e0b6d401de92ca4.tar.gz rust-4ffde0814f43076c944f46890e0b6d401de92ca4.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/backtrace.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs index 2561b1bebb5..cba7d81937a 100644 --- a/src/libstd/sys/windows/backtrace.rs +++ b/src/libstd/sys/windows/backtrace.rs @@ -31,6 +31,7 @@ use mem; use ops::Drop; use option::Option::{Some, None}; use path::Path; +use ptr; use result::Result::{Ok, Err}; use slice::SliceExt; use str::{self, StrExt}; diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index 83c116e9b05..d148f82184b 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -13,6 +13,7 @@ use prelude::v1::*; use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL}; use mem; +use ptr; use rt; use sys_common::mutex::{MUTEX_INIT, Mutex}; |