[Mesa-stable] [Mesa-dev] [PATCH 1/3] auxiliary/os: fix the android build - s/drm_munmap/os_munmap/

[Brian Paul]

On 03/16/2015 09:00 AM, Emil Velikov wrote:
> 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>
> ---
>   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 */
>

Reviewed-by: Brian Paul <brianp at vmware.com>