summaryrefslogtreecommitdiff
path: root/src/wayland-client.c
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-02-27 17:10:03 +0100
committerKristian Høgsberg <krh@bitplanet.net>2012-02-28 14:23:58 -0500
commitbf5a8fbb98282a607ba9120516985d17858b63a4 (patch)
tree9c612224ba765de01099b01e3d9231a7ab6e01fe /src/wayland-client.c
parenta676b8f2576ff85cbdbcf5b443214c0ebd5a5abd (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.
Diffstat (limited to 'src/wayland-client.c')
-rw-r--r--src/wayland-client.c2
1 files changed, 1 insertions, 1 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;