Navigation Menu

Skip to content

Commit

Permalink
std: fix win32 build issue re: multistring parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
olsonjeffery committed Sep 17, 2013
1 parent a5275ff commit 70152ff
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/os.rs
Expand Up @@ -196,7 +196,7 @@ pub fn env() -> ~[(~str,~str)] {
if (ch as uint == 0) {
fail!("os::env() failure getting env string from OS: %s", os::last_os_error());
}
let result = unsafe { str::raw::from_c_multistring(ch as *libc::c_char, None) };
let result = str::raw::from_c_multistring(ch as *libc::c_char, None);
FreeEnvironmentStringsA(ch);
result
}
Expand Down

5 comments on commit 70152ff

@bors
Copy link
Contributor

@bors bors commented on 70152ff Sep 17, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from thestinger
at olsonjeffery@70152ff

@bors
Copy link
Contributor

@bors bors commented on 70152ff Sep 17, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging olsonjeffery/rust/newrt_file_io_1 = 70152ff into auto

@bors
Copy link
Contributor

@bors bors commented on 70152ff Sep 17, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

olsonjeffery/rust/newrt_file_io_1 = 70152ff merged ok, testing candidate = c135cb2

@bors
Copy link
Contributor

@bors bors commented on 70152ff Sep 17, 2013

@bors
Copy link
Contributor

@bors bors commented on 70152ff Sep 17, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = c135cb2

Please sign in to comment.