From 6a010b57b89b8e1650808b346ba6151d4c96a89a Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Thu, 6 Sep 2007 22:14:10 +0000
Subject: * Merge of ioq3-r1169

---
 src/sdl/sdl_glimp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/sdl')

diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index fa64d50a..07b80a81 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -22,6 +22,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "SDL.h"
 
+#if !SDL_VERSION_ATLEAST(1, 2, 10)
+#define SDL_GL_ACCELERATED_VISUAL 15
+#define SDL_GL_SWAP_CONTROL 16
+#elif MINSDL_PATCH >= 10
+#error Code block no longer necessary, please remove
+#endif
+
 #ifdef SMP
 #include "SDL_thread.h"
 #endif
@@ -37,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* Just hack it for now. */
 #ifdef MACOS_X
+#include <OpenGL/OpenGL.h>
 typedef CGLContextObj QGLContext;
 #define GLimp_GetCurrentContext() CGLGetCurrentContext()
 #define GLimp_SetCurrentContext(ctx) CGLSetCurrentContext(ctx)
-- 
cgit