Skip to content

Commit 2c18025

Browse files
committed
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
1 parent f54a0a1 commit 2c18025

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

src/unix/uclibc/x86_64/align.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
macro_rules! expand_align {
2-
() = > {
2+
() => {
33
s! {
44
#[cfg_attr(target_pointer_width = "32",
55
repr(align(4)))]

src/unix/uclibc/x86_64/mod.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//! Definitions for uclibc on 64bit systems
2-
//!
32
pub type blkcnt_t = i64;
43
pub type blksize_t = i64;
54
pub type clock_t = i64;
@@ -20,8 +19,6 @@ pub type suseconds_t = ::c_long;
2019
pub type time_t = ::c_int;
2120
pub type wchar_t = ::c_int;
2221

23-
pub type nfds_t = ::c_ulong;
24-
2522
s! {
2623
pub struct dirent {
2724
pub d_ino: ::ino64_t,
@@ -275,6 +272,7 @@ pub const O_NONBLOCK: ::c_int = 04000;
275272
pub const O_TRUNC: ::c_int = 01000;
276273
pub const NCCS: usize = 32;
277274
pub const SIG_SETMASK: ::c_int = 2; // Set the set of blocked signals
275+
#[cfg(not(target_os = "l4re"))]
278276
pub const PTHREAD_STACK_MIN: usize = 16384;
279277
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
280278
pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
@@ -286,19 +284,11 @@ pub const SOL_SOCKET: ::c_int = 1;
286284
pub const SO_RCVTIMEO: ::c_int = 20;
287285
pub const SO_REUSEADDR: ::c_int = 2;
288286
pub const SO_SNDTIMEO: ::c_int = 21;
289-
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
290-
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
291-
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
292-
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
293287
pub const RLIM_INFINITY: u64 = 0xffffffffffffffff;
294288
pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
295289
pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
296290
pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
297291

298-
extern {
299-
pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
300-
}
301-
302292
cfg_if! {
303293
if #[cfg(target_os = "l4re")] {
304294
mod l4re;

0 commit comments

Comments
 (0)