[cairo-commit] src/cairo-gl.h

[Bryce Harrington]

 src/cairo-gl.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06a2696d5fa0ea50adb1463e2ee923ac92aabbdf
Author: Bryce Harrington <bryce at osg.samsung.com>
Date:   Mon Jul 6 14:11:57 2015 -0700

    cairo-gl: Still check the value of the macros
    
    Just because they're defined doesn't mean they've been enabled.

diff --git a/src/cairo-gl.h b/src/cairo-gl.h
index daf8b46..7b01eb2 100644
--- a/src/cairo-gl.h
+++ b/src/cairo-gl.h
@@ -92,7 +92,7 @@ cairo_public void
 cairo_gl_device_set_thread_aware (cairo_device_t	*device,
 				  cairo_bool_t		 thread_aware);
 
-#if defined(CAIRO_HAS_GLX_FUNCTIONS)
+#if defined(CAIRO_HAS_GLX_FUNCTIONS) && CAIRO_HAS_GLX_FUNCTIONS
 #include <GL/glx.h>
 
 cairo_public cairo_device_t *
@@ -110,7 +110,7 @@ cairo_gl_surface_create_for_window (cairo_device_t *device,
 				    int width, int height);
 #endif
 
-#if defined(CAIRO_HAS_WGL_FUNCTIONS)
+#if defined(CAIRO_HAS_WGL_FUNCTIONS) && CAIRO_HAS_WGL_FUNCTIONS
 #include <windows.h>
 
 cairo_public cairo_device_t *
@@ -126,7 +126,7 @@ cairo_gl_surface_create_for_dc (cairo_device_t		*device,
 				int			 height);
 #endif
 
-#if defined(CAIRO_HAS_EGL_FUNCTIONS)
+#if defined(CAIRO_HAS_EGL_FUNCTIONS) && CAIRO_HAS_EGL_FUNCTIONS
 #include <EGL/egl.h>
 
 cairo_public cairo_device_t *