Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

x86_64-uclibc-l4re: fix syntax error + linter issues #1293

Merged
merged 2 commits into from Mar 3, 2019
Merged

x86_64-uclibc-l4re: fix syntax error + linter issues #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c18025
x86_64-uclibc-l4re: fix syntax error + linter issues
humenda Mar 2, 2019
3c8a493
fix style issue
humenda Mar 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/unix/uclibc/x86_64/align.rs
View file
Open in desktop
@@ -1,5 +1,5 @@
macro_rules! expand_align {
() = > {
() => {
s! {
#[cfg_attr(target_pointer_width = "32",
repr(align(4)))]
Expand Down
12 changes: 0 additions & 12 deletions src/unix/uclibc/x86_64/mod.rs
View file
Open in desktop
@@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/unix/uclibc/x86_64/other.rs
View file
Open in desktop
Expand Up @@ -2,3 +2,4 @@
// separate module
pub type pthread_t = ::c_ulong;

pub const PTHREAD_STACK_MIN: usize = 16384;