diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-02-27 17:10:03 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-02-28 14:23:58 -0500 |
| commit | bf5a8fbb98282a607ba9120516985d17858b63a4 (patch) | |
| tree | 9c612224ba765de01099b01e3d9231a7ab6e01fe | |
| parent | a676b8f2576ff85cbdbcf5b443214c0ebd5a5abd (diff) | |
Rename client side wl_display_destroy() to wl_display_disconnect()
This avoids the clash with the wayland-server version with the same
name, and allows linking against both wayland-client and wayland-server
at the same time, which can be useful for unit testing purposes as
well as for nested compositing.
Without this there will be crashes as the wrong wl_display_destroy()
is called.
| -rw-r--r-- | src/wayland-client.c | 2 | ||||
| -rw-r--r-- | src/wayland-client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wayland-client.c b/src/wayland-client.c index 7814379..d3989ed 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -397,7 +397,7 @@ wl_display_connect(const char *name) } WL_EXPORT void -wl_display_destroy(struct wl_display *display) +wl_display_disconnect(struct wl_display *display) { struct wl_global *global, *gnext; struct wl_global_listener *listener, *lnext; diff --git a/src/wayland-client.h b/src/wayland-client.h index efeee4a..b04a7ef 100644 --- a/src/wayland-client.h +++ b/src/wayland-client.h @@ -71,7 +71,7 @@ typedef int (*wl_display_update_func_t)(uint32_t mask, void *data); typedef void (*wl_callback_func_t)(void *data, uint32_t time); struct wl_display *wl_display_connect(const char *name); -void wl_display_destroy(struct wl_display *display); +void wl_display_disconnect(struct wl_display *display); int wl_display_get_fd(struct wl_display *display, wl_display_update_func_t update, void *data); void wl_display_iterate(struct wl_display *display, uint32_t mask); |