Skip to content

Commit 69f9844

Browse files
authored
Merge pull request #1658 from connorkuehl/unify-mmap-flags
Unify mmap flags
2 parents da8f35a + ae46b45 commit 69f9844

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,6 @@ pub const LC_ALL_MASK: ::c_int = ::LC_CTYPE_MASK
481481
| LC_MEASUREMENT_MASK
482482
| LC_IDENTIFICATION_MASK;
483483

484-
pub const MAP_SHARED_VALIDATE: ::c_int = 0x3;
485-
pub const MAP_FIXED_NOREPLACE: ::c_int = 0x100000;
486-
487484
pub const ENOTSUP: ::c_int = EOPNOTSUPP;
488485

489486
pub const SOCK_SEQPACKET: ::c_int = 5;

src/unix/linux_like/linux/mod.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,6 +2304,14 @@ pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
23042304
pub const ALG_OP_DECRYPT: ::c_int = 0;
23052305
pub const ALG_OP_ENCRYPT: ::c_int = 1;
23062306

2307+
// include/uapi/linux/mman.h
2308+
pub const MAP_SHARED_VALIDATE: ::c_int = 0x3;
2309+
2310+
// include/uapi/asm-generic/mman-common.h
2311+
#[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
2312+
pub const MAP_SYNC : ::c_int = 0x080000;
2313+
pub const MAP_FIXED_NOREPLACE: ::c_int = 0x100000;
2314+
23072315
// uapi/linux/vm_sockets.h
23082316
pub const VMADDR_CID_ANY: ::c_uint = 0xFFFFFFFF;
23092317
pub const VMADDR_CID_HYPERVISOR: ::c_uint = 0;

0 commit comments

Comments
 (0)