# HG changeset patch # User Sam Lantinga # Date 1291233772 28800 # Node ID ba79f17d68c127ebddbfbdd7edd09927f5d39551 # Parent 40a43c6d9220390edef3eb699b314afb851c32fa Don't conflict with glext.h if it's already been included diff -r 40a43c6d9220 -r ba79f17d68c1 include/SDL_opengl.h --- a/include/SDL_opengl.h Tue Nov 30 18:08:01 2010 -0800 +++ b/include/SDL_opengl.h Wed Dec 01 12:02:52 2010 -0800 @@ -38,6 +38,10 @@ #endif #include #endif +#ifdef __glext_h_ +/* Someone has already included glext.h */ +#define NO_SDL_GLEXT +#endif #ifndef NO_SDL_GLEXT #define __glext_h_ /* Don't let gl.h include glext.h */ #endif