---

olsonjeffery · brson · commit a35955034bea · 2012-05-22T22:29:16.000-07:00
yaml --- r: 12972 b: refs/heads/master c: 64048d4 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 83cca502406dec68ec7833fa41e3821d0fe058c0
+refs/heads/master: 64048d43d6d71d022b8324b36b5132df4099e2ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/libstd/uv_ll.rs b/trunk/src/libstd/uv_ll.rs
@@ -637,14 +637,15 @@ unsafe fn tcp_bind(tcp_server_ptr: *uv_tcp_t,
                                  addr_ptr);
 }
 
-unsafe fn listen(stream: *libc::c_void, backlog: libc::c_int,
+unsafe fn listen<T>(stream: *T, backlog: libc::c_int,
                  cb: *u8) -> libc::c_int {
-    ret rustrt::rust_uv_listen(stream, backlog, cb);
+    ret rustrt::rust_uv_listen(stream as *libc::c_void, backlog, cb);
 }
 
-unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
+unsafe fn accept<T, U>(server: *T, client: *T)
     -> libc::c_int {
-    ret rustrt::rust_uv_accept(server, client);
+    ret rustrt::rust_uv_accept(server as *libc::c_void,
+                               client as *libc::c_void);
 }
 
 unsafe fn write<T>(req: *uv_write_t, stream: *T,

Original file line number	Diff line number	Diff line change
`@@ -637,14 +637,15 @@ unsafe fn tcp_bind(tcp_server_ptr: *uv_tcp_t,`
`637`	`637`	`addr_ptr);`
`638`	`638`	`}`
`639`	`639`
`640`		`-unsafe fn listen(stream: *libc::c_void, backlog: libc::c_int,`
	`640`	`+unsafe fn listen<T>(stream: *T, backlog: libc::c_int,`
`641`	`641`	`cb: *u8) -> libc::c_int {`
`642`		`- ret rustrt::rust_uv_listen(stream, backlog, cb);`
	`642`	`+ ret rustrt::rust_uv_listen(stream as *libc::c_void, backlog, cb);`
`643`	`643`	`}`
`644`	`644`
`645`		`-unsafe fn accept(server: libc::c_void, client: libc::c_void)`
	`645`	`+unsafe fn accept<T, U>(server: T, client: T)`
`646`	`646`	`-> libc::c_int {`
`647`		`- ret rustrt::rust_uv_accept(server, client);`
	`647`	`+ ret rustrt::rust_uv_accept(server as *libc::c_void,`
	`648`	`+ client as *libc::c_void);`
`648`	`649`	`}`
`649`	`650`
`650`	`651`	`unsafe fn write<T>(req: uv_write_t, stream: T,`