---

tamird · tamird · commit 0bd59320c719 · 2015-03-15T01:29:13.000-07:00
yaml --- r: 191293 b: refs/heads/try c: 04c947c h: refs/heads/master i: 191291: f569e10 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 809a554fca2d0ebc2ba50077016fe282a4064752
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c64d671671aea2e44ee7fc6eb00ee75fc30ed7b9
-refs/heads/try: 0b01a9bb4b93e3f763b4ab924179462b415991d4
+refs/heads/try: 04c947c13a180e00ce87970ac573862247c69cde
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/libstd/sys/unix/tty.rs b/branches/try/src/libstd/sys/unix/tty.rs
@@ -23,6 +23,8 @@ pub struct TTY {
 }
 
 #[cfg(any(target_os = "macos",
+          target_os = "ios",
+          target_os = "dragonfly",
           target_os = "freebsd",
           target_os = "bitrig",
           target_os = "openbsd"))]
@@ -54,12 +56,6 @@ impl TTY {
         Err(sys_common::unimpl())
     }
 
-    #[cfg(any(target_os = "linux",
-              target_os = "android",
-              target_os = "macos",
-              target_os = "freebsd",
-              target_os = "bitrig",
-              target_os = "openbsd"))]
     pub fn get_winsize(&mut self) -> IoResult<(int, int)> {
         unsafe {
             #[repr(C)]
@@ -82,10 +78,4 @@ impl TTY {
             }
         }
     }
-
-    #[cfg(any(target_os = "ios",
-              target_os = "dragonfly"))]
-    pub fn get_winsize(&mut self) -> IoResult<(int, int)> {
-        Err(sys_common::unimpl())
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ pub struct TTY {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`#[cfg(any(target_os = "macos",`
	`26`	`+ target_os = "ios",`
	`27`	`+ target_os = "dragonfly",`
`26`	`28`	`target_os = "freebsd",`
`27`	`29`	`target_os = "bitrig",`
`28`	`30`	`target_os = "openbsd"))]`
`@@ -54,12 +56,6 @@ impl TTY {`
`54`	`56`	`Err(sys_common::unimpl())`
`55`	`57`	`}`
`56`	`58`
`57`		`- #[cfg(any(target_os = "linux",`
`58`		`- target_os = "android",`
`59`		`- target_os = "macos",`
`60`		`- target_os = "freebsd",`
`61`		`- target_os = "bitrig",`
`62`		`- target_os = "openbsd"))]`
`63`	`59`	`pub fn get_winsize(&mut self) -> IoResult<(int, int)> {`
`64`	`60`	`unsafe {`
`65`	`61`	`#[repr(C)]`
`@@ -82,10 +78,4 @@ impl TTY {`
`82`	`78`	`}`
`83`	`79`	`}`
`84`	`80`	`}`
`85`		`-`
`86`		`- #[cfg(any(target_os = "ios",`
`87`		`- target_os = "dragonfly"))]`
`88`		`- pub fn get_winsize(&mut self) -> IoResult<(int, int)> {`
`89`		`- Err(sys_common::unimpl())`
`90`		`- }`
`91`	`81`	`}`