Merge pull request rust-lang#329 from sateffen/master

alexcrichton · web-flow · commit 864910a9f8be · 2016-07-11T08:34:40.000-07:00
Added linger struct
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -109,6 +109,11 @@ s! {
         pub ws_xpixel: ::c_ushort,
         pub ws_ypixel: ::c_ushort,
     }
+
+    pub struct linger {
+        pub l_onoff: ::c_int,
+        pub l_linger: ::c_int,
+    }
 }
 
 pub const SIG_DFL: sighandler_t = 0 as sighandler_t;

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@ s! {`
`109`	`109`	`pub ws_xpixel: ::c_ushort,`
`110`	`110`	`pub ws_ypixel: ::c_ushort,`
`111`	`111`	`}`
	`112`	`+`
	`113`	`+ pub struct linger {`
	`114`	`+ pub l_onoff: ::c_int,`
	`115`	`+ pub l_linger: ::c_int,`
	`116`	`+ }`
`112`	`117`	`}`
`113`	`118`
`114`	`119`	`pub const SIG_DFL: sighandler_t = 0 as sighandler_t;`