[MPlayer-dev-eng] [PATCH] vo_gl2.c header shuffle

[Erik Lunchpail]

--- Reimar D�ffinger <Reimar.Doeffinger at stud.uni-karlsruhe.de> wrote:

> Hi,
> On Mon, May 22, 2006 at 12:15:38PM -0400, Erik Lunchpail wrote:
> > This is preemptive to the win32 gui. It fixes yet_another_objidl.h
> > STREAM_SEEK conflict. Doesn't seem to affect compilation otherwise.
> > Tested with and without the gui in both linux and windows.
> 
> Please give me the full compile error, I want to understand things
> before applying anything, and maybe there is a better way to fix.
> 

Full error was:

In file included from C:/msys/1.0/mingw/include/objbase.h:73,
                 from C:/msys/1.0/mingw/include/ole2.h:9,
                 from C:/msys/1.0/mingw/include/windows.h:111,
                 from gl_common.h:11,
                 from vo_gl2.c:22:
C:/msys/1.0/mingw/include/objidl.h:32: error: syntax error before
numeric constant
make[1]: *** [vo_gl2.o] Error 1
make[1]: Leaving directory `/mingw/MPlayer-20060519/libvo'
make: *** [libvo/libvo.a] Error 2

I believe it's because gl_common.h includes windows.h, but it's being
included after interface.h, which in turn includes stream.h and is
where the STREAM_SEEK conflict is happening. Moving the #include
"Gui/interface.h" after the gl_common.h include works as well, but
haven't tested compilation in linux yet.

Regards,
Erik

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com