Mesa (10.5): auxiliary/os: fix the android build - s/drm_munmap/os_munmap/

Emil Velikov evelikov at kemper.freedesktop.org
Thu Mar 26 01:44:45 UTC 2015


Module: Mesa
Branch: 10.5
Commit: 0410d9b18646948c9d1e11592589d98b298e7b34
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0410d9b18646948c9d1e11592589d98b298e7b34

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Mar 16 15:00:18 2015 +0000

auxiliary/os: fix the android build - s/drm_munmap/os_munmap/

Squash this silly typo introduced with commit c63eb5dd5ec(auxiliary/os: get
the mmap/munmap wrappers working with android)

Cc: "10.4 10.5" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 55f0c0a29f788c5df4820e81c0cf93613ccedf5e)

---

 src/gallium/auxiliary/os/os_mman.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/os/os_mman.h b/src/gallium/auxiliary/os/os_mman.h
index 19c9a5b..3fc8c43 100644
--- a/src/gallium/auxiliary/os/os_mman.h
+++ b/src/gallium/auxiliary/os/os_mman.h
@@ -70,8 +70,8 @@ static INLINE void *os_mmap(void *addr, size_t length, int prot, int flags,
    return __mmap2(addr, length, prot, flags, fd, (size_t) (offset >> 12));
 }
 
-#  define drm_munmap(addr, length) \
-              munmap(addr, length)
+#  define os_munmap(addr, length) \
+             munmap(addr, length)
 
 #else
 /* assume large file support exists */




More information about the mesa-commit mailing list