commit ce98dc70b91b38f9a10224a39af2ff7491745e92
author Mark Salyzyn <salyzyn@google.com> Fri May 02 20:07:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 20:07:11 2014 +0000
tree 641ee119a7abca97b0022f70aea3ca5d4d500143
parent 82e1b89f22a2f088ff38f1ff094f22d7b31327b6
parent 1e10b661cc5cc58e76540e271e463e94f53c0db8

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

* commit '1e10b661cc5cc58e76540e271e463e94f53c0db8':
  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)
 {