On Mon, Apr 28, 2014 at 11:19 AM, Jasper St. Pierre
<jstpie...@mecheye.net>wrote:

> ---
>  clients/window.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/clients/window.c b/clients/window.c
> index d822af7..3897440 100644
> --- a/clients/window.c
> +++ b/clients/window.c
> @@ -4338,11 +4338,11 @@ surface_create(struct window *window)
>         return surface;
>  }
>
> -static window_buffer_type
> +static enum window_buffer_type
>

Whoops, you can see an improper rebase here. I'll fix that. :)


>  get_preferred_buffer_type(struct display *display)
>  {
>  #ifdef HAVE_CAIRO_EGL
> -       if (display->argb_device)
> +       if (display->argb_device && !getenv("TOYTOOLKIT_NO_EGL"))
>                 return WINDOW_BUFFER_TYPE_EGL_WINDOW;
>  #endif
>
> --
> 1.9.0
>
>


-- 
  Jasper
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to