Rename RemapFlags to MRemapFlags for consistency with MREMAP macro prefix

Author: sporksmith

src/sys/mman.rs

@@ -142,7 +142,7 @@ libc_bitflags!{
 #[cfg(target_os = "linux")]
 libc_bitflags!{
     /// Options for `mremap()`.
-    pub struct RemapFlags: c_int {
+    pub struct MRemapFlags: c_int {
         /// Permit the kernel to relocate the mapping to a new virtual address, if necessary.
         MREMAP_MAYMOVE;
         /// Place the mapping at exactly the address specified in `new_address`.
@@ -336,7 +336,7 @@ pub unsafe fn mremap(
     addr: *mut c_void,
     old_size: size_t,
     new_size: size_t,
-    flags: RemapFlags,
+    flags: MRemapFlags,
     new_address: Option<* mut c_void>,
 ) -> Result<*mut c_void> {
     let ret = libc::mremap(addr, old_size, new_size, flags.bits(), new_address.unwrap_or(std::ptr::null_mut()));

test/sys/test_mman.rs

@@ -3,7 +3,7 @@ use nix::libc::{c_void, size_t};
 use nix::sys::mman::{mmap, MapFlags, ProtFlags};
 
 #[cfg(target_os = "linux")]
-use nix::sys::mman::{mremap, RemapFlags};
+use nix::sys::mman::{mremap, MRemapFlags};
 
 #[test]
 fn test_mmap_anonymous() {
@@ -36,7 +36,7 @@ fn test_mremap_grow() {
 
     let slice : &mut[u8] = unsafe {
         let mem = mremap(slice.as_mut_ptr() as * mut c_void, ONE_K, 10 * ONE_K,
-                         RemapFlags::MREMAP_MAYMOVE, None)
+                         MRemapFlags::MREMAP_MAYMOVE, None)
                       .unwrap();
         std::slice::from_raw_parts_mut(mem as * mut u8, 10 * ONE_K)
     };
@@ -67,7 +67,7 @@ fn test_mremap_shrink() {
 
     let slice : &mut[u8] = unsafe {
         let mem = mremap(slice.as_mut_ptr() as * mut c_void, 10 * ONE_K, ONE_K,
-                         RemapFlags::empty(), None)
+                         MRemapFlags::empty(), None)
                       .unwrap();
         // Since we didn't supply MREMAP_MAYMOVE, the address should be the
         // same.