summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-23 12:31:42 -0700
committerMark Salyzyn <salyzyn@google.com>2014-05-23 15:10:06 -0700
commit289e111a009809ec18c3b652b7805e61bb515f6e (patch)
tree4fc43de7c272e635a803a14f282565c75fa05528
parent4887842c925f304dc862bdd5810f27cdd2eaedcb (diff)
downloadsystem_core-289e111a009809ec18c3b652b7805e61bb515f6e.zip
system_core-289e111a009809ec18c3b652b7805e61bb515f6e.tar.gz
system_core-289e111a009809ec18c3b652b7805e61bb515f6e.tar.bz2
system/window.h: add deprecation warnings
Change-Id: I38de3d281f28e0750b4abb86f28509f98dfc7a72
-rw-r--r--include/system/window.h19
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,