Skip to content

Commit 134f120

Browse files
authored
Merge pull request #11 from rust-lang/master
Sync with rust-lang/libc branch master
2 parents 676d9fb + b17f22d commit 134f120

File tree

7 files changed

+8
-1
lines changed

7 files changed

+8
-1
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ task:
2222
- curl https://sh.rustup.rs -sSf --output rustup.sh
2323
- sh rustup.sh --default-toolchain nightly -y
2424
- . $HOME/.cargo/env
25-
- rustup default nightly-2019-08-22
25+
- rustup default nightly
2626
test_script:
2727
- . $HOME/.cargo/env
2828
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd

src/cloudabi/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ extern "C" {
140140
pub fn isspace(c: c_int) -> c_int;
141141
pub fn isupper(c: c_int) -> c_int;
142142
pub fn isxdigit(c: c_int) -> c_int;
143+
pub fn isblank(c: c_int) -> c_int;
143144
pub fn tolower(c: c_int) -> c_int;
144145
pub fn toupper(c: c_int) -> c_int;
145146
pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;

src/fuchsia/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3293,6 +3293,7 @@ extern "C" {
32933293
pub fn isspace(c: c_int) -> c_int;
32943294
pub fn isupper(c: c_int) -> c_int;
32953295
pub fn isxdigit(c: c_int) -> c_int;
3296+
pub fn isblank(c: c_int) -> c_int;
32963297
pub fn tolower(c: c_int) -> c_int;
32973298
pub fn toupper(c: c_int) -> c_int;
32983299
pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;

src/unix/linux_like/linux/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,8 @@ pub const SCHED_RR: ::c_int = 2;
11971197
pub const SCHED_BATCH: ::c_int = 3;
11981198
pub const SCHED_IDLE: ::c_int = 5;
11991199

1200+
pub const SCHED_RESET_ON_FORK: ::c_int = 0x40000000;
1201+
12001202
// netinet/in.h
12011203
// NOTE: These are in addition to the constants defined in src/unix/mod.rs
12021204

src/unix/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ extern "C" {
385385
pub fn isspace(c: c_int) -> c_int;
386386
pub fn isupper(c: c_int) -> c_int;
387387
pub fn isxdigit(c: c_int) -> c_int;
388+
pub fn isblank(c: c_int) -> c_int;
388389
pub fn tolower(c: c_int) -> c_int;
389390
pub fn toupper(c: c_int) -> c_int;
390391
#[cfg_attr(

src/vxworks/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,7 @@ extern "C" {
10351035
pub fn isspace(c: c_int) -> c_int;
10361036
pub fn isupper(c: c_int) -> c_int;
10371037
pub fn isxdigit(c: c_int) -> c_int;
1038+
pub fn isblank(c: c_int) -> c_int;
10381039
pub fn tolower(c: c_int) -> c_int;
10391040
pub fn toupper(c: c_int) -> c_int;
10401041
pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;

src/windows/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ extern "C" {
228228
pub fn isspace(c: c_int) -> c_int;
229229
pub fn isupper(c: c_int) -> c_int;
230230
pub fn isxdigit(c: c_int) -> c_int;
231+
pub fn isblank(c: c_int) -> c_int;
231232
pub fn tolower(c: c_int) -> c_int;
232233
pub fn toupper(c: c_int) -> c_int;
233234
pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;

0 commit comments

Comments
 (0)