Rename __unused to __UNUSED for glibc support.

Glibc declares unused fields as __unused and so a #define for __unused causes
issues when we built against glibc on the host. Rename __unused to __UNUSED as
a workaround.
This fixed checkbuild for 64-bit host builds. Bug: 13751317

Change-Id: Ic2cd52518c16661497cc819cb3fd7f1fa5c6f0fb
This commit is contained in:
Ian Rogers 2014-06-27 16:38:01 -07:00
parent 10f8cd1d87
commit de8b983357
1 changed files with 6 additions and 6 deletions

View File

@ -26,8 +26,8 @@
#include <system/graphics.h>
#include <unistd.h>
#ifndef __unused
#define __unused __attribute__((__unused__))
#ifndef __UNUSED
#define __UNUSED __attribute__((__unused__))
#endif
#ifndef __deprecated
#define __deprecated __attribute__((__deprecated__))
@ -610,19 +610,19 @@ static inline int native_window_set_usage(
/* deprecated. Always returns 0. Don't call. */
static inline int native_window_connect(
struct ANativeWindow* window __unused, int api __unused) __deprecated;
struct ANativeWindow* window __UNUSED, int api __UNUSED) __deprecated;
static inline int native_window_connect(
struct ANativeWindow* window __unused, int api __unused) {
struct ANativeWindow* window __UNUSED, int api __UNUSED) {
return 0;
}
/* deprecated. Always returns 0. Don't call. */
static inline int native_window_disconnect(
struct ANativeWindow* window __unused, int api __unused) __deprecated;
struct ANativeWindow* window __UNUSED, int api __UNUSED) __deprecated;
static inline int native_window_disconnect(
struct ANativeWindow* window __unused, int api __unused) {
struct ANativeWindow* window __UNUSED, int api __UNUSED) {
return 0;
}