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

am 811f2c0b: Merge "system/window.h: add deprecation warnings"

Browse source 
* commit '811f2c0b98d6f8935123221648c96ff975688902':
  system/window.h: add deprecation warnings
This commit is contained in:
Mark Salyzyn 2014-05-28 19:28:30 +00:00 • committed by Android Git Automerger
commit 6445b40e93
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/system/window.h
View file

@ -29,6 +29,9 @@
#ifndef __unused #ifndef __unused
#define __unused __attribute__((__unused__)) #define __unused __attribute__((__unused__))
#endif #endif
#ifndef __deprecated
#define __deprecated __attribute__((__deprecated__))
#endif
__BEGIN_DECLS __BEGIN_DECLS
@ -586,7 +589,7 @@ struct ANativeWindow
* android_native_window_t is deprecated. * android_native_window_t is deprecated.
*/ */
typedef struct ANativeWindow ANativeWindow; typedef struct ANativeWindow ANativeWindow;
typedef struct ANativeWindow android_native_window_t; typedef struct ANativeWindow android_native_window_t __deprecated;
/* /*
* native_window_set_usage(..., usage) * native_window_set_usage(..., usage)
@ -606,12 +609,18 @@ 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(
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(
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;
@ -666,6 +675,10 @@ static inline int native_window_set_post_transform_crop(
* sets the post-transform crop for compatibility while multi-project commits * sets the post-transform crop for compatibility while multi-project commits
* get checked. * get checked.
*/ */
static inline int native_window_set_active_rect(
struct ANativeWindow* window,
android_native_rect_t const * active_rect) __deprecated;
static inline int native_window_set_active_rect( static inline int native_window_set_active_rect(
struct ANativeWindow* window, struct ANativeWindow* window,
android_native_rect_t const * active_rect) android_native_rect_t const * active_rect)
@ -693,6 +706,10 @@ static inline int native_window_set_buffer_count(
* XXX: This function is deprecated. The native_window_set_buffers_dimensions * XXX: This function is deprecated. The native_window_set_buffers_dimensions
* and native_window_set_buffers_format functions should be used instead. * and native_window_set_buffers_format functions should be used instead.
*/ */
static inline int native_window_set_buffers_geometry(
struct ANativeWindow* window,
int w, int h, int format) __deprecated;
static inline int native_window_set_buffers_geometry( static inline int native_window_set_buffers_geometry(
struct ANativeWindow* window, struct ANativeWindow* window,
int w, int h, int format) int w, int h, int format)