OpenE2K
/
libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #424 - mmatyas:android_afnetlink, r=alexcrichton 

Make the AF_NETLINK constant available for Android

Currently the `AF_NETLINK` constant is not available for Android, but [it has the same value as on Linux](https://android.googlesource.com/kernel/common/+/android-4.4.y/include/linux/socket.h#177). To fix it, this patch moves the definition to the common `notbsd/mod.rs`.

(this fixes an [issue we found in Servo](https://github.com/servo/servo/issues/13154#issuecomment-251325701))
This commit is contained in:
bors 2016-10-10 07:39:26 -07:00 committed by GitHub
parent f3acbba633 c52458c38c
commit 56b270454f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unix/notbsd/linux/mod.rs
View File

@ -506,8 +506,6 @@ pub const EFD_SEMAPHORE: ::c_int = 0x1;
pub const NCCS: usize = 32;
pub const AF_NETLINK: ::c_int = 16;
pub const LOG_NFACILITIES: ::c_int = 24;
pub const SEM_FAILED: *mut ::sem_t = 0 as *mut sem_t;

1
src/unix/notbsd/mod.rs
View File

@ -435,6 +435,7 @@ pub const IFF_DYNAMIC: ::c_int = 0x8000;
pub const AF_UNIX: ::c_int = 1;
pub const AF_INET: ::c_int = 2;
pub const AF_INET6: ::c_int = 10;
pub const AF_NETLINK: ::c_int = 16;
pub const SOCK_RAW: ::c_int = 3;
pub const IPPROTO_TCP: ::c_int = 6;
pub const IPPROTO_IP: ::c_int = 0;