From 38b7f7d09f32b2e97afe166efbe26f054c6bec1e Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 11 Nov 2012 11:53:21 -0600 Subject: [PATCH] In glew.h, check for __gltypes_h_ and define it avoid glew.h conflicts with Mac OpenGL.framework/Headers/gltypes.h #206 Different definitions of GLhandleARB in GLEW and OS X headers --- auto/src/glew_head.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index c9f1189..f33f440 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -8,6 +8,9 @@ #if defined(__gl2_h_) #error gl2.h included before glew.h #endif +#if defined(__gltypes_h_) +#error gltypes.h included before glew.h +#endif #if defined(__REGAL_H__) #error Regal.h included before glew.h #endif @@ -21,6 +24,7 @@ #define __gl_h_ #define __gl2_h_ #define __GL_H__ +#define __gltypes_h_ #define __REGAL_H__ #define __X_GL_H #define __glext_h_