Merge "Rename __unused to __UNUSED for glibc support."

This commit is contained in:
Ian Rogers 2014-06-29 23:02:25 +00:00 committed by Gerrit Code Review
commit 63a61e561d

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;
}