summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBenjamin Franzke <[email protected]>2012-03-05 20:28:42 +0100
committerBenjamin Franzke <[email protected]>2012-03-05 20:34:42 +0100
commite6aa32ac7f8d7b843f4d4f8bf9d8e9db790b0868 (patch)
treefbf06d45a67a9239a44293a80194e6e17b065267 /src
parentda5e9fce47b2029c6f6445ed53f3b5e5ff3889a0 (diff)
wayland: Use new wl_display_disconnect
This replaces the previously used wl_display_destroy. wl_display_destroy was povided by wayland-client.so and wayland-server.so, to resolve that conflict its renamed client-side.
Diffstat (limited to 'src')
-rw-r--r--src/egl/drivers/dri2/platform_wayland.c2
-rw-r--r--src/gallium/state_trackers/egl/wayland/native_drm.c2
-rw-r--r--src/gallium/state_trackers/egl/wayland/native_shm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index b2981a02cd0..ad649b141dd 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -731,7 +731,7 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp)
free(dri2_dpy->device_name);
wl_drm_destroy(dri2_dpy->wl_drm);
if (dri2_dpy->own_device)
- wl_display_destroy(dri2_dpy->wl_dpy);
+ wl_display_disconnect(dri2_dpy->wl_dpy);
free(dri2_dpy);
disp->DriverData = NULL;
diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c
index ad238bee122..8daf7830dd4 100644
--- a/src/gallium/state_trackers/egl/wayland/native_drm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -80,7 +80,7 @@ wayland_drm_display_destroy(struct native_display *ndpy)
if (drmdpy->base.configs)
FREE(drmdpy->base.configs);
if (drmdpy->base.own_dpy)
- wl_display_destroy(drmdpy->base.dpy);
+ wl_display_disconnect(drmdpy->base.dpy);
ndpy_uninit(ndpy);
diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c
index 7d83e78fb49..c2375788aac 100644
--- a/src/gallium/state_trackers/egl/wayland/native_shm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
@@ -66,7 +66,7 @@ wayland_shm_display_destroy(struct native_display *ndpy)
if (shmdpy->base.configs)
FREE(shmdpy->base.configs);
if (shmdpy->base.own_dpy)
- wl_display_destroy(shmdpy->base.dpy);
+ wl_display_disconnect(shmdpy->base.dpy);
ndpy_uninit(ndpy);