ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."

Browse source 
* commit '63a61e561d7d3d6f10488a194fb730f9edec3edc':
  Rename __unused to __UNUSED for glibc support.
This commit is contained in:
Ian Rogers 2014-06-29 23:05:58 +00:00 • committed by Android Git Automerger
commit 33dce382fd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/system/window.h
View file

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