diff options
| author | bors <bors@rust-lang.org> | 2014-04-06 02:56:39 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-06 02:56:39 -0700 |
| commit | f1f50565a1fda0dfd60d89fea65e2328f42cc5e0 (patch) | |
| tree | c6afc2ec113c761b4a284e1370f00f29155f7025 /src/test/run-fail | |
| parent | 667f82a79b2275a696b21086ddf5148a617fe20a (diff) | |
| parent | 38f7a1b41b0ff9c1bcaec9a892c8ffb64ad6139f (diff) | |
| download | rust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.tar.gz rust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.zip | |
auto merge of #13315 : alexcrichton/rust/libc, r=alexcrichton,me
Rebasing of #12526 with a very obscure bug fixed on windows.
Diffstat (limited to 'src/test/run-fail')
| -rw-r--r-- | src/test/run-fail/extern-fail.rs | 4 | ||||
| -rw-r--r-- | src/test/run-fail/morestack2.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-fail.rs index 93f55261574..c11d269a897 100644 --- a/src/test/run-fail/extern-fail.rs +++ b/src/test/run-fail/extern-fail.rs @@ -13,11 +13,11 @@ // Testing that runtime failure doesn't cause callbacks to abort abnormally. // Instead the failure will be delivered after the callbacks return. -use std::libc; +extern crate libc; use std::task; mod rustrt { - use std::libc; + extern crate libc; extern { pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs index 2430c5bb666..67153042590 100644 --- a/src/test/run-fail/morestack2.rs +++ b/src/test/run-fail/morestack2.rs @@ -16,11 +16,11 @@ // See the hack in upcall_call_shim_on_c_stack where it messes // with the stack limit. -use std::libc; +extern crate libc; use std::task; mod rustrt { - use std::libc; + extern crate libc; extern { pub fn rust_get_argc() -> libc::c_int; |
