diff options
author | bors <bors@rust-lang.org> | 2019-03-03 15:18:25 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-03-03 15:18:25 +0000 |
commit | 234f9a656920a149289b379462c3559f0b5177d7 (patch) | |
tree | 21f4681b9ad40947c962ee7221e44ffb3c94c156 | |
parent | 2c278d12a008c3a06ce7e2645756f4e56bb18950 (diff) | |
parent | 3c8a4932a4c4e3371af55bd6d134b7b842aa48fb (diff) | |
download | rust-libc-234f9a656920a149289b379462c3559f0b5177d7.tar.gz |
Auto merge of #1293 - humenda:master, r=gnzlbg
x86_64-uclibc-l4re: fix syntax error + linter issues
- fix syntax error in expand_align macro
- fix errors due to doubly defined symbols / functions for
x86_64-uclibc
-rw-r--r-- | src/unix/uclibc/x86_64/align.rs | 2 | ||||
-rw-r--r-- | src/unix/uclibc/x86_64/mod.rs | 12 | ||||
-rw-r--r-- | src/unix/uclibc/x86_64/other.rs | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/unix/uclibc/x86_64/align.rs b/src/unix/uclibc/x86_64/align.rs index 5fb4a4d518..5a97c19fb9 100644 --- a/src/unix/uclibc/x86_64/align.rs +++ b/src/unix/uclibc/x86_64/align.rs @@ -1,5 +1,5 @@ macro_rules! expand_align { - () = > { + () => { s! { #[cfg_attr(target_pointer_width = "32", repr(align(4)))] diff --git a/src/unix/uclibc/x86_64/mod.rs b/src/unix/uclibc/x86_64/mod.rs index bc084394c3..0afa7dc77b 100644 --- a/src/unix/uclibc/x86_64/mod.rs +++ b/src/unix/uclibc/x86_64/mod.rs @@ -1,5 +1,4 @@ //! Definitions for uclibc on 64bit systems -//! pub type blkcnt_t = i64; pub type blksize_t = i64; pub type clock_t = i64; @@ -20,8 +19,6 @@ pub type suseconds_t = ::c_long; pub type time_t = ::c_int; pub type wchar_t = ::c_int; -pub type nfds_t = ::c_ulong; - s! { pub struct dirent { pub d_ino: ::ino64_t, @@ -275,7 +272,6 @@ pub const O_NONBLOCK: ::c_int = 04000; pub const O_TRUNC: ::c_int = 01000; pub const NCCS: usize = 32; pub const SIG_SETMASK: ::c_int = 2; // Set the set of blocked signals -pub const PTHREAD_STACK_MIN: usize = 16384; pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40; pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4; pub const SO_BROADCAST: ::c_int = 6; @@ -286,19 +282,11 @@ pub const SOL_SOCKET: ::c_int = 1; pub const SO_RCVTIMEO: ::c_int = 20; pub const SO_REUSEADDR: ::c_int = 2; pub const SO_SNDTIMEO: ::c_int = 21; -pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0; -pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1; -pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2; -pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL; pub const RLIM_INFINITY: u64 = 0xffffffffffffffff; pub const __SIZEOF_PTHREAD_COND_T: usize = 48; pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4; pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56; -extern { - pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void; -} - cfg_if! { if #[cfg(target_os = "l4re")] { mod l4re; diff --git a/src/unix/uclibc/x86_64/other.rs b/src/unix/uclibc/x86_64/other.rs index 1cc521df99..481577cfc2 100644 --- a/src/unix/uclibc/x86_64/other.rs +++ b/src/unix/uclibc/x86_64/other.rs @@ -2,3 +2,4 @@ // separate module pub type pthread_t = ::c_ulong; +pub const PTHREAD_STACK_MIN: usize = 16384; |