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
2014-05-02 20:07:11 +00:00 · 2014-05-02 20:07:11 +00:00 · ce98dc70b9
parent 82e1b89f22 1e10b661cc
commit ce98dc70b9
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)
 {