[MPlayer-dev-eng] [PATCH 2/3] Fix some warnings with Objective-C code and declarations

[Jiang Jiang]

On Tue, Jul 16, 2013 at 9:32 PM, Reimar Döffinger
<Reimar.Doeffinger at gmx.de> wrote:
> On Tue, Jul 16, 2013 at 05:44:17PM +0800, Xidorn Quan wrote:
>> On Tue, Jul 16, 2013 at 5:15 PM, Jiang Jiang <gzjjgod at gmail.com> wrote:
>>
>> > On Tue, Jul 16, 2013 at 3:47 AM, Xidorn Quan <quanxunzhen at gmail.com>
>> > wrote:
>> > > I removed the include part since I saw no difference in the output of
>> > > compiler.
>> >
>> > I have only tried building with 10.9 SDK recently, without the
>> > <OpenGL/gl.h> include there it doesn't compile. Perhaps in earlier SDK
>> > that header was included implicitly by some other headers.
>>
>>
>> I do not have 10.9 SDK by now, but I will test it as soon as I upgrade to
>> 10.9.
>
> Please mention the exact error, either of you.
> Usually this is due to something missing from our own gl_compat.h
> header.

See https://gist.github.com/jjgod/6024281 for errors I got. At least
it looks like I should include gl_common.h.

diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index b375af7..58c5d2b 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -25,7 +25,6 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include <CoreServices/CoreServices.h>
-#include <OpenGL/gl.h>
 //special workaround for Apple bug #6267445
 //(OSServices Power API disabled in OSServices.h for 64bit systems)
 #ifndef __POWER__
@@ -47,8 +46,8 @@
 #include "input/input.h"
 #include "input/mouse.h"

+#include "gl_common.h"
 #include "osdep/keycodes.h"
-#include "osx_common.h"

 //Cocoa
 static NSDistantObject *mplayerosxProxy;