diff options
| author | José Fonseca <jose.r.fonseca@gmail.com> | 2011-12-01 21:36:31 +0000 |
|---|---|---|
| committer | José Fonseca <jose.r.fonseca@gmail.com> | 2011-12-02 09:19:26 +0000 |
| commit | 937c2451d4c8aa1b433e6f607536065620e76967 (patch) | |
| tree | db6a0b8fbd5ecee1b1a724f4afbe426780179365 | |
| parent | 5c9af5bf5232a49efe7b69ed0bcacc9f1f50db05 (diff) | |
Make the GLenum_int hack for MacOS robust against include order.
| -rw-r--r-- | glimports.hpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/glimports.hpp b/glimports.hpp index d0dc0da..65b0aca 100644 --- a/glimports.hpp +++ b/glimports.hpp @@ -34,13 +34,19 @@ // Prevent including system's glext.h #define __glext_h_ + // Some functions take GLenum disguised as GLint. Apple noticed and fixed it // in the Mac OS X 10.6.x gl.h headers. Regardless, C++ typechecking rules // force the wrappers to match the prototype precisely. -#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_7) -#define GLenum_int GLenum +#if defined(__APPLE__) +# include <AvailabilityMacros.h> // for MAC_OS_X_VERSION_10_7 +# if defined(MAC_OS_X_VERSION_10_7) +# define GLenum_int GLint +# else +# define GLenum_int GLenum +# endif #else -#define GLenum_int GLint +# define GLenum_int GLint #endif |