---

olsonjeffery · brson · commit c81d057b2611 · 2012-05-22T22:29:16.000-07:00
yaml --- r: 12975 b: refs/heads/master c: a4127d3 h: refs/heads/master i: 12973: 5c55f6e 12971: e30820d 12967: bbac0c2 12959: 1ccee08 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 465412aeff7b0e7d7e55877402b9e736024c3675
+refs/heads/master: a4127d3fc696588e00fd2201a95c766b2bf8755f
 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
@@ -642,7 +642,7 @@ unsafe fn listen<T>(stream: *T, backlog: libc::c_int,
     ret rustrt::rust_uv_listen(stream as *libc::c_void, backlog, cb);
 }
 
-unsafe fn accept<T, U>(server: *T, client: *T)
+unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
     -> libc::c_int {
     ret rustrt::rust_uv_accept(server as *libc::c_void,
                                client as *libc::c_void);

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ unsafe fn listen<T>(stream: *T, backlog: libc::c_int,`
`642`	`642`	`ret rustrt::rust_uv_listen(stream as *libc::c_void, backlog, cb);`
`643`	`643`	`}`
`644`	`644`
`645`		`-unsafe fn accept<T, U>(server: T, client: T)`
	`645`	`+unsafe fn accept(server: libc::c_void, client: libc::c_void)`
`646`	`646`	`-> libc::c_int {`
`647`	`647`	`ret rustrt::rust_uv_accept(server as *libc::c_void,`
`648`	`648`	`client as *libc::c_void);`