diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-28 19:28:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 19:28:30 +0000 |
| commit | 6445b40e93931dedcb831f38343c031c13b7ddb2 (patch) | |
| tree | 739ae3f19d826ba018a96e82d0d04d206c1ce662 | |
| parent | c4ffa5f62ef256ff286122d0ceea61364aa67e13 (diff) | |
| parent | 811f2c0b98d6f8935123221648c96ff975688902 (diff) | |
| download | system_core-6445b40e93931dedcb831f38343c031c13b7ddb2.zip system_core-6445b40e93931dedcb831f38343c031c13b7ddb2.tar.gz system_core-6445b40e93931dedcb831f38343c031c13b7ddb2.tar.bz2 | |
am 811f2c0b: Merge "system/window.h: add deprecation warnings"
* commit '811f2c0b98d6f8935123221648c96ff975688902':
system/window.h: add deprecation warnings
| -rw-r--r-- | include/system/window.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/system/window.h b/include/system/window.h index cfb4bee..16b7b67 100644 --- a/include/system/window.h +++ b/include/system/window.h @@ -29,6 +29,9 @@ #ifndef __unused #define __unused __attribute__((__unused__)) #endif +#ifndef __deprecated +#define __deprecated __attribute__((__deprecated__)) +#endif __BEGIN_DECLS @@ -586,7 +589,7 @@ struct ANativeWindow * android_native_window_t is deprecated. */ typedef struct ANativeWindow ANativeWindow; -typedef struct ANativeWindow android_native_window_t; +typedef struct ANativeWindow android_native_window_t __deprecated; /* * native_window_set_usage(..., usage) @@ -607,12 +610,18 @@ 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; + +static inline int native_window_connect( 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; + +static inline int native_window_disconnect( struct ANativeWindow* window __unused, int api __unused) { return 0; } @@ -668,6 +677,10 @@ static inline int native_window_set_post_transform_crop( */ 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( + struct ANativeWindow* window, android_native_rect_t const * active_rect) { return native_window_set_post_transform_crop(window, active_rect); @@ -695,6 +708,10 @@ static inline int native_window_set_buffer_count( */ 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( + struct ANativeWindow* window, int w, int h, int format) { return window->perform(window, NATIVE_WINDOW_SET_BUFFERS_GEOMETRY, |