[cairo-commit] src/glew

[Andrea Canciani]

 src/glew/GL/glew.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c43399fa68696aa62599fb71752850dd46c15c82
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Jun 9 17:53:09 2010 +0200

    gl: fix compilation on MacOS X
    
    MacOS X uses different defines to avoid multiple inclusion of GL
    header files. Adding them to glew.h fixes the compilation when GL is
    enabled.

diff --git a/src/glew/GL/glew.h b/src/glew/GL/glew.h
index 7aefd63..cd38410 100644
--- a/src/glew/GL/glew.h
+++ b/src/glew/GL/glew.h
@@ -80,7 +80,7 @@
 #define __glew_h__
 #define __GLEW_H__
 
-#if defined(__gl_h_) || defined(__GL_H__)
+#if defined(__gl_h_) || defined(__GL_H__) || defined(__X_GL_H)
 #error gl.h included before glew.h
 #endif
 #if defined(__glext_h_) || defined(__GLEXT_H_)
@@ -92,6 +92,7 @@
 
 #define __gl_h_
 #define __GL_H__
+#define __X_GL_H
 #define __glext_h_
 #define __GLEXT_H_
 #define __gl_ATI_h_