Skip to content

Commit e352483

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 137695 b: refs/heads/auto c: 8ccb616 h: refs/heads/master i: 137693: 2634fa4 137691: 2013183 137687: caa5d4a 137679: 0654099 137663: 1fefb9a v: v3
1 parent 2ebaaeb commit e352483

File tree

3 files changed

+55
-55
lines changed

3 files changed

+55
-55
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6532a8c95ac5ac4d695d689a944ca725716fc0a4
16+
refs/heads/auto: 8ccb61609238063b2f1b0cd038974426cdf81bc8
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/src/libnative/io/c_unix.rs

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,41 @@ use libc;
2323
target_os = "ios",
2424
target_os = "freebsd",
2525
target_os = "dragonfly"))]
26-
pub static FIONBIO: libc::c_ulong = 0x8004667e;
26+
pub const FIONBIO: libc::c_ulong = 0x8004667e;
2727
#[cfg(any(all(target_os = "linux",
2828
any(target_arch = "x86",
2929
target_arch = "x86_64",
3030
target_arch = "arm")),
3131
target_os = "android"))]
32-
pub static FIONBIO: libc::c_ulong = 0x5421;
32+
pub const FIONBIO: libc::c_ulong = 0x5421;
3333
#[cfg(all(target_os = "linux",
3434
any(target_arch = "mips", target_arch = "mipsel")))]
35-
pub static FIONBIO: libc::c_ulong = 0x667e;
35+
pub const FIONBIO: libc::c_ulong = 0x667e;
3636

3737
#[cfg(any(target_os = "macos",
3838
target_os = "ios",
3939
target_os = "freebsd",
4040
target_os = "dragonfly"))]
41-
pub static FIOCLEX: libc::c_ulong = 0x20006601;
41+
pub const FIOCLEX: libc::c_ulong = 0x20006601;
4242
#[cfg(any(all(target_os = "linux",
4343
any(target_arch = "x86",
4444
target_arch = "x86_64",
4545
target_arch = "arm")),
4646
target_os = "android"))]
47-
pub static FIOCLEX: libc::c_ulong = 0x5451;
47+
pub const FIOCLEX: libc::c_ulong = 0x5451;
4848
#[cfg(all(target_os = "linux",
4949
any(target_arch = "mips", target_arch = "mipsel")))]
50-
pub static FIOCLEX: libc::c_ulong = 0x6601;
50+
pub const FIOCLEX: libc::c_ulong = 0x6601;
5151

5252
#[cfg(any(target_os = "macos",
5353
target_os = "ios",
5454
target_os = "freebsd",
5555
target_os = "dragonfly"))]
56-
pub static MSG_DONTWAIT: libc::c_int = 0x80;
56+
pub const MSG_DONTWAIT: libc::c_int = 0x80;
5757
#[cfg(any(target_os = "linux", target_os = "android"))]
58-
pub static MSG_DONTWAIT: libc::c_int = 0x40;
58+
pub const MSG_DONTWAIT: libc::c_int = 0x40;
5959

60-
pub static WNOHANG: libc::c_int = 1;
60+
pub const WNOHANG: libc::c_int = 1;
6161

6262
extern {
6363
pub fn gettimeofday(timeval: *mut libc::timeval,
@@ -89,7 +89,7 @@ extern {
8989

9090
#[cfg(any(target_os = "macos", target_os = "ios"))]
9191
mod select {
92-
pub static FD_SETSIZE: uint = 1024;
92+
pub const FD_SETSIZE: uint = 1024;
9393

9494
#[repr(C)]
9595
pub struct fd_set {
@@ -109,7 +109,7 @@ mod select {
109109
use std::uint;
110110
use libc;
111111

112-
pub static FD_SETSIZE: uint = 1024;
112+
pub const FD_SETSIZE: uint = 1024;
113113

114114
#[repr(C)]
115115
pub struct fd_set {
@@ -131,14 +131,14 @@ mod select {
131131
mod signal {
132132
use libc;
133133

134-
pub static SA_NOCLDSTOP: libc::c_ulong = 0x00000001;
135-
pub static SA_NOCLDWAIT: libc::c_ulong = 0x00000002;
136-
pub static SA_NODEFER: libc::c_ulong = 0x40000000;
137-
pub static SA_ONSTACK: libc::c_ulong = 0x08000000;
138-
pub static SA_RESETHAND: libc::c_ulong = 0x80000000;
139-
pub static SA_RESTART: libc::c_ulong = 0x10000000;
140-
pub static SA_SIGINFO: libc::c_ulong = 0x00000004;
141-
pub static SIGCHLD: libc::c_int = 17;
134+
pub const SA_NOCLDSTOP: libc::c_ulong = 0x00000001;
135+
pub const SA_NOCLDWAIT: libc::c_ulong = 0x00000002;
136+
pub const SA_NODEFER: libc::c_ulong = 0x40000000;
137+
pub const SA_ONSTACK: libc::c_ulong = 0x08000000;
138+
pub const SA_RESETHAND: libc::c_ulong = 0x80000000;
139+
pub const SA_RESTART: libc::c_ulong = 0x10000000;
140+
pub const SA_SIGINFO: libc::c_ulong = 0x00000004;
141+
pub const SIGCHLD: libc::c_int = 17;
142142

143143
// This definition is not as accurate as it could be, {pid, uid, status} is
144144
// actually a giant union. Currently we're only interested in these fields,
@@ -179,14 +179,14 @@ mod signal {
179179
mod signal {
180180
use libc;
181181

182-
pub static SA_NOCLDSTOP: libc::c_ulong = 0x00000001;
183-
pub static SA_NOCLDWAIT: libc::c_ulong = 0x00010000;
184-
pub static SA_NODEFER: libc::c_ulong = 0x40000000;
185-
pub static SA_ONSTACK: libc::c_ulong = 0x08000000;
186-
pub static SA_RESETHAND: libc::c_ulong = 0x80000000;
187-
pub static SA_RESTART: libc::c_ulong = 0x10000000;
188-
pub static SA_SIGINFO: libc::c_ulong = 0x00000008;
189-
pub static SIGCHLD: libc::c_int = 18;
182+
pub const SA_NOCLDSTOP: libc::c_ulong = 0x00000001;
183+
pub const SA_NOCLDWAIT: libc::c_ulong = 0x00010000;
184+
pub const SA_NODEFER: libc::c_ulong = 0x40000000;
185+
pub const SA_ONSTACK: libc::c_ulong = 0x08000000;
186+
pub const SA_RESETHAND: libc::c_ulong = 0x80000000;
187+
pub const SA_RESTART: libc::c_ulong = 0x10000000;
188+
pub const SA_SIGINFO: libc::c_ulong = 0x00000008;
189+
pub const SIGCHLD: libc::c_int = 18;
190190

191191
// This definition is not as accurate as it could be, {pid, uid, status} is
192192
// actually a giant union. Currently we're only interested in these fields,
@@ -223,14 +223,14 @@ mod signal {
223223
mod signal {
224224
use libc;
225225

226-
pub static SA_ONSTACK: libc::c_int = 0x0001;
227-
pub static SA_RESTART: libc::c_int = 0x0002;
228-
pub static SA_RESETHAND: libc::c_int = 0x0004;
229-
pub static SA_NOCLDSTOP: libc::c_int = 0x0008;
230-
pub static SA_NODEFER: libc::c_int = 0x0010;
231-
pub static SA_NOCLDWAIT: libc::c_int = 0x0020;
232-
pub static SA_SIGINFO: libc::c_int = 0x0040;
233-
pub static SIGCHLD: libc::c_int = 20;
226+
pub const SA_ONSTACK: libc::c_int = 0x0001;
227+
pub const SA_RESTART: libc::c_int = 0x0002;
228+
pub const SA_RESETHAND: libc::c_int = 0x0004;
229+
pub const SA_NOCLDSTOP: libc::c_int = 0x0008;
230+
pub const SA_NODEFER: libc::c_int = 0x0010;
231+
pub const SA_NOCLDWAIT: libc::c_int = 0x0020;
232+
pub const SA_SIGINFO: libc::c_int = 0x0040;
233+
pub const SIGCHLD: libc::c_int = 20;
234234

235235
#[cfg(any(target_os = "macos", target_os = "ios"))]
236236
pub type sigset_t = u32;

‎branches/auto/src/libnative/io/c_windows.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414

1515
use libc;
1616

17-
pub static WSADESCRIPTION_LEN: uint = 256;
18-
pub static WSASYS_STATUS_LEN: uint = 128;
19-
pub static FIONBIO: libc::c_long = 0x8004667e;
17+
pub const WSADESCRIPTION_LEN: uint = 256;
18+
pub const WSASYS_STATUS_LEN: uint = 128;
19+
pub const FIONBIO: libc::c_long = 0x8004667e;
2020
static FD_SETSIZE: uint = 64;
21-
pub static MSG_DONTWAIT: libc::c_int = 0;
22-
pub static ERROR_ILLEGAL_CHARACTER: libc::c_int = 582;
23-
pub static ENABLE_ECHO_INPUT: libc::DWORD = 0x4;
24-
pub static ENABLE_EXTENDED_FLAGS: libc::DWORD = 0x80;
25-
pub static ENABLE_INSERT_MODE: libc::DWORD = 0x20;
26-
pub static ENABLE_LINE_INPUT: libc::DWORD = 0x2;
27-
pub static ENABLE_PROCESSED_INPUT: libc::DWORD = 0x1;
28-
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;
21+
pub const MSG_DONTWAIT: libc::c_int = 0;
22+
pub const ERROR_ILLEGAL_CHARACTER: libc::c_int = 582;
23+
pub const ENABLE_ECHO_INPUT: libc::DWORD = 0x4;
24+
pub const ENABLE_EXTENDED_FLAGS: libc::DWORD = 0x80;
25+
pub const ENABLE_INSERT_MODE: libc::DWORD = 0x20;
26+
pub const ENABLE_LINE_INPUT: libc::DWORD = 0x2;
27+
pub const ENABLE_PROCESSED_INPUT: libc::DWORD = 0x1;
28+
pub const ENABLE_QUICK_EDIT_MODE: libc::DWORD = 0x40;
29+
pub const WSA_INVALID_EVENT: WSAEVENT = 0 as WSAEVENT;
30+
31+
pub const FD_ACCEPT: libc::c_long = 0x08;
32+
pub const FD_MAX_EVENTS: uint = 10;
33+
pub const WSA_INFINITE: libc::DWORD = libc::INFINITE;
34+
pub const WSA_WAIT_TIMEOUT: libc::DWORD = libc::consts::os::extra::WAIT_TIMEOUT;
35+
pub const WSA_WAIT_EVENT_0: libc::DWORD = libc::consts::os::extra::WAIT_OBJECT_0;
36+
pub const WSA_WAIT_FAILED: libc::DWORD = libc::consts::os::extra::WAIT_FAILED;
3737

3838
#[repr(C)]
3939
#[cfg(target_arch = "x86")]

0 commit comments

Comments
 (0)