diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 16:34:15 -0700 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-04-02 02:07:51 +0200 |
| commit | f86318d63c86568b312f39da20bea67e328c1fc5 (patch) | |
| tree | 36c7d66caea7d71f389adb2583d1fae252327e49 /src/liblibc | |
| parent | 07ff8ab8855b4d5ce0d547cfe3b1bf03e5f427eb (diff) | |
| download | rust-f86318d63c86568b312f39da20bea67e328c1fc5.tar.gz rust-f86318d63c86568b312f39da20bea67e328c1fc5.zip | |
Test fixes and rebase conflicts, round 2
Conflicts: src/libcore/num/mod.rs
Diffstat (limited to 'src/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 77e18be298b..bfc657f8784 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -2865,7 +2865,7 @@ pub mod consts { pub const MAP_FIXED : c_int = 0x0010; pub const MAP_ANON : c_int = 0x0020; - pub const MAP_FAILED : *mut c_void = -1 as *mut c_void; + pub const MAP_FAILED : *mut c_void = !0 as *mut c_void; pub const MCL_CURRENT : c_int = 0x0001; pub const MCL_FUTURE : c_int = 0x0002; |