Skip to content

Commit

Permalink
auto merge of #17896 : mahkoh/rust/intmax, r=alexcrichton
Browse files Browse the repository at this point in the history
Closes #17075

I don't know if this is correct. The easiest way to find out is to run the following program on all targets but I can't do it myself.
```c
#include <stdint.h>
#include <stdio.h>

int main(void)
{
	if (sizeof(intmax_t) != 8) {
		puts("ERROR");
		return 1;
	}
}
```
  • Loading branch information
bors committed Oct 24, 2014
2 parents c53f8a9 + 3ff7a3d commit 00cc6d2
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/liblibc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ pub use types::os::arch::c95::{c_ushort, clock_t, ptrdiff_t, c_schar};
pub use types::os::arch::c95::{size_t, time_t, suseconds_t};
pub use types::os::arch::c99::{c_longlong, c_ulonglong};
pub use types::os::arch::c99::{intptr_t, uintptr_t};
pub use types::os::arch::c99::{intmax_t, uintmax_t};
pub use types::os::arch::posix88::{dev_t, ino_t, mode_t};
pub use types::os::arch::posix88::{off_t, pid_t, ssize_t};

Expand Down Expand Up @@ -533,6 +534,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i32;
pub type uintptr_t = u32;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
#[cfg(any(target_arch = "x86",
target_arch = "mips",
Expand Down Expand Up @@ -740,6 +743,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i64;
pub type uintptr_t = u64;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
pub mod posix88 {
pub type off_t = i64;
Expand Down Expand Up @@ -973,6 +978,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i64;
pub type uintptr_t = u64;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
pub mod posix88 {
pub type off_t = i64;
Expand Down Expand Up @@ -1186,6 +1193,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i64;
pub type uintptr_t = u64;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
pub mod posix88 {
pub type off_t = i64;
Expand Down Expand Up @@ -1426,6 +1435,9 @@ pub mod types {
pub type uintptr_t = u32;
#[cfg(target_arch = "x86_64")]
pub type uintptr_t = u64;

pub type intmax_t = i64;
pub type uintmax_t = u64;
}

pub mod posix88 {
Expand Down Expand Up @@ -1815,6 +1827,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i32;
pub type uintptr_t = u32;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
pub mod posix88 {
pub type off_t = i64;
Expand Down Expand Up @@ -1916,6 +1930,8 @@ pub mod types {
pub type c_ulonglong = u64;
pub type intptr_t = i64;
pub type uintptr_t = u64;
pub type intmax_t = i64;
pub type uintmax_t = u64;
}
pub mod posix88 {
pub type off_t = i64;
Expand Down

0 comments on commit 00cc6d2

Please sign in to comment.