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

* commit 'ce98dc70b91b38f9a10224a39af2ff7491745e92': libcutils: Mac build pulls in __unused from sys/cdefs.h
2014-05-02 20:09:54 +00:00 · 2014-05-02 20:09:54 +00:00 · b3eefcaa93
parent a0a461d3b7 ce98dc70b9
commit b3eefcaa93
1 changed files with 2 additions and 0 deletions
--- 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)
 {