From 838e76c6994043168266f16a3ba3d15efc2e603b Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Thu, 16 Jan 2014 11:33:39 -0300 Subject: [PATCH] Fix to compile against the Wayland v1.4 headers --- src/video/wayland/SDL_waylanddyn.h | 1 + src/video/wayland/SDL_waylandsym.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h index bf1bc924ec1c3..a1ff557164581 100644 --- a/src/video/wayland/SDL_waylanddyn.h +++ b/src/video/wayland/SDL_waylanddyn.h @@ -78,6 +78,7 @@ void SDL_WAYLAND_UnloadSymbols(void); #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data) #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) +#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) #define wl_seat_interface (*WAYLAND_wl_seat_interface) #define wl_surface_interface (*WAYLAND_wl_surface_interface) diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h index 1494d3f48e137..6d65a44bea53d 100644 --- a/src/video/wayland/SDL_waylandsym.h +++ b/src/video/wayland/SDL_waylandsym.h @@ -51,6 +51,10 @@ SDL_WAYLAND_SYM(int, wl_list_length, (const struct wl_list *)) SDL_WAYLAND_SYM(int, wl_list_empty, (const struct wl_list *)) SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) +/* These functions are available in Wayland >= 1.4 */ +SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) +SDL_WAYLAND_SYM(void, wl_proxy_marshal_constructor, (uint32_t opcode, const struct wl_interface *interface, ...)) + SDL_WAYLAND_INTERFACE(wl_seat_interface) SDL_WAYLAND_INTERFACE(wl_surface_interface) SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)