From: Vinson Lee Date: Sat, 18 Feb 2012 19:16:18 +0000 (-0800) Subject: st/egl: Move drm_display_authenticate into HAVE_WAYLAND_BACKEND section. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d394bc5853f70f5a2d4c4b396e55b96c1ba63be7;p=mesa.git st/egl: Move drm_display_authenticate into HAVE_WAYLAND_BACKEND section. Fixes this GCC warning. native_drm.c:153:1: warning: ‘drm_display_authenticate’ defined but not used [-Wunused-function] Signed-off-by: Vinson Lee Reviewed-by: José Fonseca --- diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm/native_drm.c index c013769e57d..6ac12100f76 100644 --- a/src/gallium/state_trackers/egl/drm/native_drm.c +++ b/src/gallium/state_trackers/egl/drm/native_drm.c @@ -149,15 +149,6 @@ static struct native_display_buffer drm_display_buffer = { drm_display_export_native_buffer }; -static int -drm_display_authenticate(void *user_data, uint32_t magic) -{ - struct native_display *ndpy = user_data; - struct drm_display *drmdpy = drm_display(ndpy); - - return drmAuthMagic(drmdpy->fd, magic); -} - static char * drm_get_device_name(int fd) { @@ -196,6 +187,15 @@ out: #ifdef HAVE_WAYLAND_BACKEND +static int +drm_display_authenticate(void *user_data, uint32_t magic) +{ + struct native_display *ndpy = user_data; + struct drm_display *drmdpy = drm_display(ndpy); + + return drmAuthMagic(drmdpy->fd, magic); +} + static struct wayland_drm_callbacks wl_drm_callbacks = { drm_display_authenticate, egl_g3d_wl_drm_helper_reference_buffer,