Mesa (master): st/egl: Move drm_display_authenticate into HAVE_WAYLAND_BACKEND section.
Vinson Lee
vlee at kemper.freedesktop.org
Mon Feb 20 21:18:24 UTC 2012
Module: Mesa
Branch: master
Commit: d394bc5853f70f5a2d4c4b396e55b96c1ba63be7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d394bc5853f70f5a2d4c4b396e55b96c1ba63be7
Author: Vinson Lee <vlee at freedesktop.org>
Date: Sat Feb 18 11:16:18 2012 -0800
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 <vlee at freedesktop.org>
Reviewed-by: José Fonseca <jfonseca at vmware.com>
---
src/gallium/state_trackers/egl/drm/native_drm.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm/native_drm.c
index c013769..6ac1210 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,
More information about the mesa-commit
mailing list