[Mesa-dev] [PATCH v2] st/egl: Move drm_display_authenticate into HAVE_WAYLAND_BACKEND section.

Jose Fonseca jfonseca at vmware.com
Mon Feb 20 07:05:03 PST 2012


Looks great. Thanks Vinson.

Jose

----- Original Message -----
> 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>
> ---
>  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,
> --
> 1.7.9
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 


More information about the mesa-dev mailing list