Mercurial > sdl-ios-xcode

changeset 4922:ba79f17d68c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't conflict with glext.h if it's already been included
author Sam Lantinga <slouken@libsdl.org>
date Wed, 01 Dec 2010 12:02:52 -0800
parents 40a43c6d9220
children 1002d074d459
files include/SDL_opengl.h
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 <windows.h>
 #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