From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Mon, 5 Mar 2012 19:28:42 +0000 (+0100)
Subject: wayland: Use new wl_display_disconnect
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6aa32ac7f8d7b843f4d4f8bf9d8e9db790b0868;p=mesa.git

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.
---

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