From: Sharvil Nanavati <sharvil@google.com>
Date: Tue, 3 Jun 2014 07:16:07 +0000 (-0700)
Subject: Rename UNUSED to UNUSED_ATTR in OSI due to symbol collision.
X-Git-Tag: android-x86-7.1-r1~1507^2~75
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=970f914b;p=android-x86%2Fsystem-bt.git

Rename UNUSED to UNUSED_ATTR in OSI due to symbol collision.

Change-Id: Ib26dbae713b3096adf2496f0ff0fcb607693b163
---

diff --git a/osi/include/osi.h b/osi/include/osi.h
index 3ca81a62c..2b79527ea 100644
--- a/osi/include/osi.h
+++ b/osi/include/osi.h
@@ -3,5 +3,5 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#define UNUSED __attribute__((unused))
+#define UNUSED_ATTR __attribute__((unused))
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
diff --git a/osi/src/list.c b/osi/src/list.c
index 5d84ef610..caffa8c6f 100644
--- a/osi/src/list.c
+++ b/osi/src/list.c
@@ -185,7 +185,7 @@ const list_node_t *list_begin(const list_t *list) {
 // this function returns the value of an invalid iterator for the given list.
 // When an iterator has the same value as what's returned by this function, you
 // may no longer call |list_next| with the iterator. |list| may not be NULL.
-const list_node_t *list_end(UNUSED const list_t *list) {
+const list_node_t *list_end(UNUSED_ATTR const list_t *list) {
   assert(list != NULL);
   return NULL;
 }