Skip to content

Commit 2f6e35f

Browse files
committed
---
yaml --- r: 61355 b: refs/heads/try c: cc2897d h: refs/heads/master i: 61353: 2b20fd5 61351: 8d6ede7 v: v3
1 parent f691e92 commit 2f6e35f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
5-
refs/heads/try: f6401bad24d2fb1e1f959595c2f57cb4964e7082
5+
refs/heads/try: cc2897d559742c5f7630557975aa72c12a0eff01
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/unstable/lang.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,16 +423,14 @@ pub unsafe fn strdup_uniq(ptr: *c_uchar, len: uint) -> ~str {
423423
#[lang="start"]
424424
pub fn start(main: *u8, argc: int, argv: **c_char,
425425
crate_map: *u8) -> int {
426-
use libc::getenv;
427426
use rt;
428427
use sys::Closure;
429428
use ptr;
430429
use cast;
430+
use os;
431431

432432
unsafe {
433-
let use_old_rt = do str::as_c_str("RUST_NEWRT") |s| {
434-
getenv(s).is_null()
435-
};
433+
let use_old_rt = os::getenv("RUST_NEWRT").is_none();
436434
if use_old_rt {
437435
return rust_start(main as *c_void, argc as c_int, argv,
438436
crate_map as *c_void) as int;

0 commit comments

Comments
 (0)