summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/wayland/wayland-server.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-04-14 10:04:50 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2011-04-14 10:04:50 +0200
commit49792128efb4ad1348b3be196f7a1b7a9dd3876c (patch)
tree351d7c3be14b9b712fa0d84640a1454194a1affc /src/3rdparty/wayland/wayland-server.h
parentc94eaf59753d2c917bb7bd9f4e4b1e1ea52dab60 (diff)
Updating src/3rdparty/wayland to head of Wayland master
In git://anongit.freedesktop.org/wayland/wayland its sha f04e05ad76cd6af890b7b741a9e0f5181bd0ac10
Diffstat (limited to 'src/3rdparty/wayland/wayland-server.h')
-rw-r--r--src/3rdparty/wayland/wayland-server.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/wayland/wayland-server.h b/src/3rdparty/wayland/wayland-server.h
index f74cbae04..8032866ca 100644
--- a/src/3rdparty/wayland/wayland-server.h
+++ b/src/3rdparty/wayland/wayland-server.h
@@ -87,6 +87,7 @@ typedef void (*wl_client_connect_func_t)(struct wl_client *client, struct wl_obj
int wl_display_add_global(struct wl_display *display, struct wl_object *object, wl_client_connect_func_t func);
+struct wl_client *wl_client_create(struct wl_display *display, int fd);
void wl_client_destroy(struct wl_client *client);
void wl_client_post_no_memory(struct wl_client *client);
void wl_client_post_global(struct wl_client *client, struct wl_object *object);
@@ -214,7 +215,8 @@ wl_display_set_compositor(struct wl_display *display,
const struct wl_compositor_interface *implementation);
void
-wl_display_post_frame(struct wl_display *display, uint32_t msecs);
+wl_display_post_frame(struct wl_display *display, struct wl_surface *surface,
+ uint32_t msecs);
void
wl_client_add_resource(struct wl_client *client,