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

[Bryce Harrington]

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

New commits:
commit c7cf0dfd602355e0c4fd1126e63844c304c1ef45
Author: Bryce Harrington <bryce at osg.samsung.com>
Date:   Mon Jul 27 14:15:11 2015 -0700

    Revert "cairo-gl: Fix compiler warning if CAIRO_HAS_*_FUNCTIONS is not defined."
    
    This reverts commit c8b6c6066a238cf4cb04679e1149e956b1556a0c.
    
    An undefined macro is evaluated as 0.
    The preference is to use #if MACRO_NAME rather than #ifdef.
    
    Conflicts:
    	src/cairo-gl.h

diff --git a/src/cairo-gl.h b/src/cairo-gl.h
index 7b01eb2..9fd7608 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) && CAIRO_HAS_GLX_FUNCTIONS
+#if 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) && CAIRO_HAS_WGL_FUNCTIONS
+#if 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) && CAIRO_HAS_EGL_FUNCTIONS
+#if CAIRO_HAS_EGL_FUNCTIONS
 #include <EGL/egl.h>
 
 cairo_public cairo_device_t *