From 2c18025f886bc97324260822d47d1f4df5d509f3 Mon Sep 17 00:00:00 2001
From: Sebastian Humenda <shumenda@gmx.de>
Date: Sat, 2 Mar 2019 19:09:17 +0100
Subject: [PATCH] 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
---
src/unix/uclibc/x86_64/align.rs | 2 +-
src/unix/uclibc/x86_64/mod.rs | 12 +-----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/unix/uclibc/x86_64/align.rs b/src/unix/uclibc/x86_64/align.rs
index 5fb4a4d5..5a97c19f 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 bc084394..5da1a83a 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,6 +272,7 @@ 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
+#[cfg(not(target_os = "l4re"))]
pub const PTHREAD_STACK_MIN: usize = 16384;
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
@@ -286,19 +284,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;
--
GitLab