# HG changeset patch
# User Szymon Wilczek <kazeuser@gmail.com>
# Date 1212763856 0
# Node ID 064c178558b7e693266d293ca91c8e3bdf575790
# Parent  5f3ea4cd5adb70b099803422ed2b49fdd992a953
sync with trunk

diff -r 5f3ea4cd5adb -r 064c178558b7 src/video/SDL_sysvideo.h
--- a/src/video/SDL_sysvideo.h	Sat May 17 10:09:11 2008 +0000
+++ b/src/video/SDL_sysvideo.h	Fri Jun 06 14:50:56 2008 +0000
@@ -127,7 +127,6 @@
 
     int display;
     SDL_Renderer *renderer;
-    SDL_GLContext context;
 
     void *userdata;
     void *driverdata;
diff -r 5f3ea4cd5adb -r 064c178558b7 src/video/SDL_video.c
--- a/src/video/SDL_video.c	Sat May 17 10:09:11 2008 +0000
+++ b/src/video/SDL_video.c	Fri Jun 06 14:50:56 2008 +0000
@@ -2525,12 +2525,6 @@
     if (!context) {
         window = NULL;
     }
-    if (window) {
-        if (window->context == context) {
-            return 0;
-        }
-        window->context = context;
-    }
     return _this->GL_MakeCurrent(_this, window, context);
 }
 
diff -r 5f3ea4cd5adb -r 064c178558b7 src/video/cocoa/SDL_cocoaopengl.m
--- a/src/video/cocoa/SDL_cocoaopengl.m	Sat May 17 10:09:11 2008 +0000
+++ b/src/video/cocoa/SDL_cocoaopengl.m	Fri Jun 06 14:50:56 2008 +0000
@@ -288,7 +288,7 @@
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];
@@ -312,7 +312,7 @@
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];