summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-02 20:05:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-02 20:05:46 +0000
commit1e10b661cc5cc58e76540e271e463e94f53c0db8 (patch)
tree2bc5a54f027ac48f1d4619c951f5c52761e4c2ec
parenta32e01d2f4292974c55d612819ef028d95dcf831 (diff)
parentedc70938beecf7390f5f9b0dee4f6c31a68e1f0a (diff)
downloadsystem_core-1e10b661cc5cc58e76540e271e463e94f53c0db8.zip
system_core-1e10b661cc5cc58e76540e271e463e94f53c0db8.tar.gz
system_core-1e10b661cc5cc58e76540e271e463e94f53c0db8.tar.bz2
Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"
-rw-r--r--libcutils/ashmem-host.c2
1 files changed, 2 insertions, 0 deletions
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)
{