diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-27 16:38:01 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-27 17:40:32 -0700 |
| commit | de8b98335763b1fbb51254e3f22247971d1c7cfe (patch) | |
| tree | 6773cb5e5cde5e06ff07a00537555957ff7fa4f8 | |
| parent | 10f8cd1d87eccde36da2ac54ad7d390e34a6e224 (diff) | |
| download | system_core-de8b98335763b1fbb51254e3f22247971d1c7cfe.zip system_core-de8b98335763b1fbb51254e3f22247971d1c7cfe.tar.gz system_core-de8b98335763b1fbb51254e3f22247971d1c7cfe.tar.bz2 | |
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
| -rw-r--r-- | include/system/window.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/system/window.h b/include/system/window.h index 16b7b67..31f202f 100644 --- a/include/system/window.h +++ b/include/system/window.h @@ -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; } |