From a0581db1fa26da148ad6bb35975be084d1504f58 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 28 Jul 2019 17:36:10 +0200
Subject: [PATCH] Merge ProtFlags and MapFlags

---
 src/data.rs |  4 ++--
 src/flag.rs | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 7f952e2cbd..06484dfd1f 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -1,6 +1,6 @@
 use core::ops::{Deref, DerefMut};
 use core::{mem, slice};
-use crate::flag::{EventFlags, ProtFlags, PtraceFlags, SigActionFlags};
+use crate::flag::{EventFlags, MapFlags, PtraceFlags, SigActionFlags};
 
 #[derive(Copy, Clone, Debug, Default)]
 #[repr(C)]
@@ -58,7 +58,7 @@ impl DerefMut for ITimerSpec {
 pub struct Map {
     pub offset: usize,
     pub size: usize,
-    pub flags: ProtFlags,
+    pub flags: MapFlags,
 }
 
 impl Deref for Map {
diff --git a/src/flag.rs b/src/flag.rs
index 77ac7e7c44..4008ddb8e5 100644
--- a/src/flag.rs
+++ b/src/flag.rs
@@ -66,6 +66,11 @@ pub const FUTEX_REQUEUE: usize = 2;
 
 bitflags! {
     pub struct MapFlags: usize {
+        const PROT_NONE = 0x0000_0000;
+        const PROT_EXEC = 0x0001_0000;
+        const PROT_WRITE = 0x0002_0000;
+        const PROT_READ = 0x0004_0000;
+
         const MAP_SHARED = 0x0001;
         const MAP_PRIVATE = 0x0002;
     }
@@ -128,15 +133,6 @@ bitflags! {
     }
 }
 
-bitflags! {
-    pub struct ProtFlags: usize {
-        const PROT_NONE = 0x0000_0000;
-        const PROT_EXEC = 0x0001_0000;
-        const PROT_WRITE = 0x0002_0000;
-        const PROT_READ = 0x0004_0000;
-    }
-}
-
 pub const SEEK_SET: usize = 0;
 pub const SEEK_CUR: usize = 1;
 pub const SEEK_END: usize = 2;