Skip to content

Commit 0163f0b

Browse files
committed
---
yaml --- r: 154609 b: refs/heads/try2 c: 7441d4f h: refs/heads/master i: 154607: 1356ca1 v: v3
1 parent f980424 commit 0163f0b

File tree

5 files changed

+229
-79
lines changed

5 files changed

+229
-79
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: cb8df7a8e3c53f16d22f76da50e6e2e4734bdf62
8+
refs/heads/try2: 7441d4f3f33b4cc21912ff9a3b495f62abc3362e
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnative/io/c_windows.rs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ pub static ENABLE_INSERT_MODE: libc::DWORD = 0x20;
2626
pub static ENABLE_LINE_INPUT: libc::DWORD = 0x2;
2727
pub static ENABLE_PROCESSED_INPUT: libc::DWORD = 0x1;
2828
pub static ENABLE_QUICK_EDIT_MODE: libc::DWORD = 0x40;
29+
pub static WSA_INVALID_EVENT: WSAEVENT = 0 as WSAEVENT;
30+
31+
pub static FD_ACCEPT: libc::c_long = 0x08;
32+
pub static FD_MAX_EVENTS: uint = 10;
33+
pub static WSA_INFINITE: libc::DWORD = libc::INFINITE;
34+
pub static WSA_WAIT_TIMEOUT: libc::DWORD = libc::consts::os::extra::WAIT_TIMEOUT;
35+
pub static WSA_WAIT_EVENT_0: libc::DWORD = libc::consts::os::extra::WAIT_OBJECT_0;
36+
pub static WSA_WAIT_FAILED: libc::DWORD = libc::consts::os::extra::WAIT_FAILED;
2937

3038
#[repr(C)]
3139
#[cfg(target_arch = "x86")]
@@ -52,6 +60,16 @@ pub struct WSADATA {
5260

5361
pub type LPWSADATA = *mut WSADATA;
5462

63+
#[repr(C)]
64+
pub struct WSANETWORKEVENTS {
65+
pub lNetworkEvents: libc::c_long,
66+
pub iErrorCode: [libc::c_int, ..FD_MAX_EVENTS],
67+
}
68+
69+
pub type LPWSANETWORKEVENTS = *mut WSANETWORKEVENTS;
70+
71+
pub type WSAEVENT = libc::HANDLE;
72+
5573
#[repr(C)]
5674
pub struct fd_set {
5775
fd_count: libc::c_uint,
@@ -68,6 +86,21 @@ extern "system" {
6886
pub fn WSAStartup(wVersionRequested: libc::WORD,
6987
lpWSAData: LPWSADATA) -> libc::c_int;
7088
pub fn WSAGetLastError() -> libc::c_int;
89+
pub fn WSACloseEvent(hEvent: WSAEVENT) -> libc::BOOL;
90+
pub fn WSACreateEvent() -> WSAEVENT;
91+
pub fn WSAEventSelect(s: libc::SOCKET,
92+
hEventObject: WSAEVENT,
93+
lNetworkEvents: libc::c_long) -> libc::c_int;
94+
pub fn WSASetEvent(hEvent: WSAEVENT) -> libc::BOOL;
95+
pub fn WSAWaitForMultipleEvents(cEvents: libc::DWORD,
96+
lphEvents: *const WSAEVENT,
97+
fWaitAll: libc::BOOL,
98+
dwTimeout: libc::DWORD,
99+
fAltertable: libc::BOOL) -> libc::DWORD;
100+
pub fn WSAEnumNetworkEvents(s: libc::SOCKET,
101+
hEventObject: WSAEVENT,
102+
lpNetworkEvents: LPWSANETWORKEVENTS)
103+
-> libc::c_int;
71104

72105
pub fn ioctlsocket(s: libc::SOCKET, cmd: libc::c_long,
73106
argp: *mut libc::c_ulong) -> libc::c_int;

0 commit comments

Comments
 (0)