Skip to content

Commit

Permalink
Auto merge of #254 - alexcrichton:rtld-default, r=alexcrichton
Browse files Browse the repository at this point in the history
Add RTLD_DEFAULT to more platforms
  • Loading branch information
bors committed Apr 4, 2016
2 parents 2ded9ae + 031a450 commit 7265c17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/unix/bsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ pub const NOFLSH: ::tcflag_t = 0x80000000;
pub const WNOHANG: ::c_int = 1;

pub const RTLD_NOW: ::c_int = 0x2;
pub const RTLD_DEFAULT: *mut ::c_void = -2isize as *mut ::c_void;

f! {
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
Expand Down
1 change: 1 addition & 0 deletions src/unix/notbsd/android/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ pub const TIOCCONS: ::c_int = 0x541D;
pub const RTLD_GLOBAL: ::c_int = 0x2;
pub const RTLD_NOLOAD: ::c_int = 0x4;
pub const RTLD_NOW: ::c_int = 0;
pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;

f! {
pub fn sigemptyset(set: *mut sigset_t) -> ::c_int {
Expand Down

0 comments on commit 7265c17

Please sign in to comment.