[PATCH wayland] shm, server, server-core: Move deprecated prototype

[Yong Bakos]

From: Yong Bakos <ybakos at humanoriented.com>

wayland-server-core.h contains the prototype of wl_shm_buffer_create,
which is marked WL_DEPRECATED.

Move the prototype out of wayland-server-core.h and into the group of
deprecated prototypes in wayland-server.h.
Add the prototype before the implementation in wayland-shm.c.

This mimics the structure of deprecated implementations in the footer of
wayland-server.c, whose prototypes are in wayland-server.h.

Signed-off-by: Yong Bakos <ybakos at humanoriented.com>
---
 src/wayland-server-core.h | 5 -----
 src/wayland-server.h      | 5 +++++
 src/wayland-shm.c         | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/wayland-server-core.h b/src/wayland-server-core.h
index fa7f394..124699c 100644
--- a/src/wayland-server-core.h
+++ b/src/wayland-server-core.h
@@ -475,11 +475,6 @@ wl_display_init_shm(struct wl_display *display);
 uint32_t *
 wl_display_add_shm_format(struct wl_display *display, uint32_t format);
 
-struct wl_shm_buffer *
-wl_shm_buffer_create(struct wl_client *client,
-		     uint32_t id, int32_t width, int32_t height,
-		     int32_t stride, uint32_t format) WL_DEPRECATED;
-
 void wl_log_set_handler_server(wl_log_func_t handler);
 
 #ifdef  __cplusplus
diff --git a/src/wayland-server.h b/src/wayland-server.h
index 3124703..1b1a496 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -90,6 +90,11 @@ void
 wl_display_remove_global(struct wl_display *display,
 			 struct wl_global *global) WL_DEPRECATED;
 
+struct wl_shm_buffer *
+wl_shm_buffer_create(struct wl_client *client,
+		     uint32_t id, int32_t width, int32_t height,
+		     int32_t stride, uint32_t format) WL_DEPRECATED;
+
 #endif
 
 #ifdef  __cplusplus
diff --git a/src/wayland-shm.c b/src/wayland-shm.c
index 5efbd70..177c4a4 100644
--- a/src/wayland-shm.c
+++ b/src/wayland-shm.c
@@ -618,6 +618,11 @@ wl_shm_buffer_end_access(struct wl_shm_buffer *buffer)
 
 /** \cond */ /* Deprecated functions below. */
 
+struct wl_shm_buffer *
+wl_shm_buffer_create(struct wl_client *client,
+		     uint32_t id, int32_t width, int32_t height,
+		     int32_t stride, uint32_t format) WL_DEPRECATED;
+
 WL_EXPORT struct wl_shm_buffer *
 wl_shm_buffer_create(struct wl_client *client,
 		     uint32_t id, int32_t width, int32_t height,
-- 
2.7.2