diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-29 23:08:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-29 23:08:49 +0000 |
| commit | 3e906630099e0508a72300e14512a62110c864c3 (patch) | |
| tree | b3d552da20560af920226206e2d0078b6110842b | |
| parent | 36d04e37ee84f17220442002d880473d465ca5ae (diff) | |
| parent | 33dce382fd39b633731c925a1487a74332e86871 (diff) | |
| download | system_core-3e906630099e0508a72300e14512a62110c864c3.zip system_core-3e906630099e0508a72300e14512a62110c864c3.tar.gz system_core-3e906630099e0508a72300e14512a62110c864c3.tar.bz2 | |
am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."
* commit '33dce382fd39b633731c925a1487a74332e86871':
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; } |