Skip to content

Commit 86e074b

Browse files
committed
---
yaml --- r: 145147 b: refs/heads/try2 c: 879cfe6 h: refs/heads/master i: 145145: 812417b 145143: 1b536a4 v: v3
1 parent b5cec72 commit 86e074b

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: f3c88825337c295850de546bd3d8745c8cad1224
8+
refs/heads/try2: 879cfe6049647cf8ecf31682b26e28b905f7d27e
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/uv/uvll.rs

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ pub enum uv_handle_type {
237237
UV_HANDLE_TYPE_MAX
238238
}
239239

240+
#[cfg(unix)]
240241
#[deriving(Eq)]
241242
pub enum uv_req_type {
242243
UV_UNKNOWN_REQ,
@@ -251,6 +252,31 @@ pub enum uv_req_type {
251252
UV_REQ_TYPE_MAX
252253
}
253254

255+
// uv_req_type may have additional fields defined by UV_REQ_TYPE_PRIVATE.
256+
// See UV_REQ_TYPE_PRIVATE at libuv/include/uv-win.h
257+
#[cfg(windows)]
258+
#[deriving(Eq)]
259+
pub enum uv_req_type {
260+
UV_UNKNOWN_REQ,
261+
UV_REQ,
262+
UV_CONNECT,
263+
UV_WRITE,
264+
UV_SHUTDOWN,
265+
UV_UDP_SEND,
266+
UV_FS,
267+
UV_WORK,
268+
UV_GETADDRINFO,
269+
UV_ACCEPT,
270+
UV_FS_EVENT_REQ,
271+
UV_POLL_REQ,
272+
UV_PROCESS_EXIT,
273+
UV_READ,
274+
UV_UDP_RECV,
275+
UV_WAKEUP,
276+
UV_SIGNAL_REQ,
277+
UV_REQ_TYPE_MAX
278+
}
279+
254280
#[deriving(Eq)]
255281
pub enum uv_membership {
256282
UV_LEAVE_GROUP,
@@ -298,10 +324,8 @@ fn handle_sanity_check() {
298324
}
299325

300326
#[test]
301-
#[ignore(cfg(windows))] // FIXME #8817
302-
#[fixed_stack_segment]
303-
#[inline(never)]
304327
fn request_sanity_check() {
328+
#[fixed_stack_segment]; #[inline(never)];
305329
unsafe {
306330
assert_eq!(UV_REQ_TYPE_MAX as uint, rust_uv_req_type_max());
307331
}

0 commit comments

Comments
 (0)