Commit bf5a8fbb authored by Samuel Rødal's avatar Samuel Rødal Committed by Kristian Høgsberg
Browse files

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.
parent a676b8f2
...@@ -397,7 +397,7 @@ wl_display_connect(const char *name) ...@@ -397,7 +397,7 @@ wl_display_connect(const char *name)
} }
WL_EXPORT void 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 *global, *gnext;
struct wl_global_listener *listener, *lnext; struct wl_global_listener *listener, *lnext;
......
...@@ -71,7 +71,7 @@ typedef int (*wl_display_update_func_t)(uint32_t mask, void *data); ...@@ -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); typedef void (*wl_callback_func_t)(void *data, uint32_t time);
struct wl_display *wl_display_connect(const char *name); 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, int wl_display_get_fd(struct wl_display *display,
wl_display_update_func_t update, void *data); wl_display_update_func_t update, void *data);
void wl_display_iterate(struct wl_display *display, uint32_t mask); void wl_display_iterate(struct wl_display *display, uint32_t mask);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment