diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-29 23:02:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-28 00:06:36 +0000 |
| commit | 63a61e561d7d3d6f10488a194fb730f9edec3edc (patch) | |
| tree | 8443706889c7b0e0d4e7b1d46cfdce76b2e8cac6 | |
| parent | 0a350f4f0857cd4a42b5099b8fda7766a35398cb (diff) | |
| parent | de8b98335763b1fbb51254e3f22247971d1c7cfe (diff) | |
| download | system_core-63a61e561d7d3d6f10488a194fb730f9edec3edc.zip system_core-63a61e561d7d3d6f10488a194fb730f9edec3edc.tar.gz system_core-63a61e561d7d3d6f10488a194fb730f9edec3edc.tar.bz2 | |
Merge "Rename __unused to __UNUSED for glibc support."
| -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; } |