commit c413e151dede74c2a877d77de4d1579b263c877a
author Mark Salyzyn <salyzyn@google.com> Fri May 02 22:17:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 22:17:57 2014 +0000
tree 2efc69fac747ff889f8d84087b6e04c167ba6b15
parent de8ff4adcaa487259f9ddcd0eab4d1117d1cca71
parent b3eefcaa934986f72a3daddf6ad86e276d14d476

am b3eefcaa: am ce98dc70: am 1e10b661: Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"

* commit 'b3eefcaa934986f72a3daddf6ad86e276d14d476':
  libcutils: Mac build pulls in __unused from sys/cdefs.h

libcutils/ashmem-host.c

diff --git a/libcutils/ashmem-host.c b/libcutils/ashmem-host.c
index cfb5d66..7873964 100644
--- a/libcutils/ashmem-host.c
+++ b/libcutils/ashmem-host.c
@@ -32,7 +32,9 @@
 
 #include <cutils/ashmem.h>
 
+#ifndef __unused
 #define __unused __attribute__((__unused__))
+#endif
 
 int ashmem_create_region(const char *ignored __unused, size_t size)
 {