mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-31 22:25:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename client side wl_display_destroy() to wl_display_disconnect()

Browse source 
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.
This commit is contained in:
Samuel Rødal 2012-02-27 17:10:03 +01:00 • committed by Kristian Høgsberg
parent a676b8f257
commit bf5a8fbb98
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wayland-client.c
View file

@ -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;

2
src/wayland-client.h
View file

@ -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);