From 4a2d22bdb1292fe2c4b415671def7959adf36920 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 24 Jul 2013 01:48:11 -0400
Subject: [PATCH] fix compilation on macos/windows

---
 src/libstd/rt/args.rs                                     | 3 ++-
 src/test/run-pass/transmute-non-immediate-to-immediate.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index f1a9c6023b90..85cdb9fc9413 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -158,6 +158,7 @@ mod imp {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "win32")]
 mod imp {
+    use option::Option;
 
     pub unsafe fn init(_argc: int, _argv: **u8) {
     }
@@ -176,4 +177,4 @@ mod imp {
     pub fn clone() -> Option<~[~str]> {
         fail!()
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/run-pass/transmute-non-immediate-to-immediate.rs
index 57844e7d860c..2f097bc90a94 100644
--- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs
+++ b/src/test/run-pass/transmute-non-immediate-to-immediate.rs
@@ -13,6 +13,6 @@
 
 fn main() {
     unsafe {
-        std::cast::transmute::<[int,..1],int>([1])
+        ::std::cast::transmute::<[int,..1],int>([1])
     };
 }