summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-10-08 04:29:01 +0900
committerGitHub <noreply@github.com>2020-10-08 04:29:01 +0900
commitda0037cb532a01049aebd38003525bba42379a3b (patch)
treed52a609e6b9f3bc3c76a3db429dbfeb3bc082a84
parent1818abfb3123fa44c8c3dd071635e85d2170647f (diff)
parent4f40b35cca87a2b476fcfb87214585898154d743 (diff)
downloadrust-libc-da0037cb532a01049aebd38003525bba42379a3b.tar.gz
Merge pull request #1913 from qwandor-google/vmaddr
Android: Add VMADDR_ constants.
-rwxr-xr-xlibc-test/build.rs3
-rw-r--r--src/unix/linux_like/android/mod.rs7
2 files changed, 10 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 4c16024a10..3a5c857dda 100755
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1562,6 +1562,9 @@ fn test_android(target: &str) {
// Needs a newer Android SDK for the definition
"P_PIDFD" => true,
+ // Requires Linux kernel 5.6
+ "VMADDR_CID_LOCAL" => true,
+
_ => false,
}
});
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
index 079de283f8..fb49108056 100644
--- a/src/unix/linux_like/android/mod.rs
+++ b/src/unix/linux_like/android/mod.rs
@@ -2129,6 +2129,13 @@ pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
pub const ALG_OP_DECRYPT: ::c_int = 0;
pub const ALG_OP_ENCRYPT: ::c_int = 1;
+// uapi/linux/vm_sockets.h
+pub const VMADDR_CID_ANY: ::c_uint = 0xFFFFFFFF;
+pub const VMADDR_CID_HYPERVISOR: ::c_uint = 0;
+pub const VMADDR_CID_LOCAL: ::c_uint = 1;
+pub const VMADDR_CID_HOST: ::c_uint = 2;
+pub const VMADDR_PORT_ANY: ::c_uint = 0xFFFFFFFF;
+
// uapi/linux/inotify.h
pub const IN_ACCESS: u32 = 0x0000_0001;
pub const IN_MODIFY: u32 = 0x0000_0002;