From 3b1c45d42171ef0da9c09b3010e33ee362fe2b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Wed, 4 Jun 2014 10:33:23 -0700 Subject: [PATCH] SDL_opengl: Fix Mac build for SDK 10.9 too. --- include/SDL_opengl.h | 3 +++ include/SDL_syswm.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index d89185bc4..ed1c2342f 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -51,7 +51,10 @@ #endif #if defined(__MACOSX__) #include /* Needed for ptrdiff_t */ +/* Hack to prevent duplicate definition of GLsizeiptrARB and GLintptrARB in */ +#define GL_ARB_vertex_buffer_object 1 #include /* Header File For The OpenGL Library */ +#undef GL_ARB_vertex_buffer_object #define __X_GL_H #else #include /* Header File For The OpenGL Library */ diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 7da78b83a..c1022c15f 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -83,7 +83,7 @@ struct SDL_SysWMinfo; #if defined(SDL_VIDEO_DRIVER_COCOA) #ifdef __OBJC__ -#include +@class NSWindow; #else typedef struct _NSWindow NSWindow; #endif