<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Apr 28, 2014 at 11:19 AM, Jasper St. Pierre <span dir="ltr"><<a href="mailto:jstpierre@mecheye.net" target="_blank">jstpierre@mecheye.net</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
 clients/window.c | 4 ++--<br>
 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/clients/window.c b/clients/window.c<br>
index d822af7..3897440 100644<br>
--- a/clients/window.c<br>
+++ b/clients/window.c<br>
@@ -4338,11 +4338,11 @@ surface_create(struct window *window)<br>
        return surface;<br>
 }<br>
<br>
-static window_buffer_type<br>
+static enum window_buffer_type<br></blockquote><div><br></div><div>Whoops, you can see an improper rebase here. I'll fix that. :)<br> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

 get_preferred_buffer_type(struct display *display)<br>
 {<br>
 #ifdef HAVE_CAIRO_EGL<br>
-       if (display->argb_device)<br>
+       if (display->argb_device && !getenv("TOYTOOLKIT_NO_EGL"))<br>
                return WINDOW_BUFFER_TYPE_EGL_WINDOW;<br>
 #endif<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.9.0<br>
<br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br>  Jasper<br>
</div></div>