[MPlayer-cygwin] [PATCH] live.com on mingw

[Joey Parrish]

On Mon, Apr 19, 2004 at 06:10:06PM -0700, Ross Finlayson wrote:
> >On Mon, Apr 19, 2004 at 07:15:47PM -0500, Joey Parrish wrote:
> >> I've got two patches here that get live.com+MPlayer compiled under mingw.
> 
> Thanks, Joey.  Re. your "live.mingw.diff" patch: I can't make this change 
> until I'm sure that the resulting code continues to compile OK on Windows 
> under other environments (in particular, VC++).  Thus:
> 
> 1/ The change from
>         #include <strstrea.h>
> to
>         #include <strstream.h>

I was wondering about that... I'll try to find a better fix.

> The code currently says:
> #if defined(__WIN32__) || defined(_WIN32)

Sorry, I should have taken more time there.
It maybe should say:

#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__MINGW32__)

Does that look sound?

> 2/ The
>         #include <ws2tcpip.h>
> in "GroupsockHelper.hh".  Note that <ws2tcpip.h> is already included in 
> "NetCommon.h":

Okay, I'll go back to the drawing board.  Let me try to figure out why I
decided to put that there.  :)  It's probably a problem similar to the
one just above...

> 3/ The
>         #define _OLE2_H /* HACK */
> in "NetCommon.hh".  Is this going to break anything for VC++, or should it 
> be #ifdef'd somehow so that it's done only for mingw?

I can't test on VC++.  I'll try to find a better solution.  What happens
on mingw is that windows.h eventually includes ole2.h, which conflicts
heavily with various definitions in MPlayer.  In theory, there's always
an elegant solution... I'll make a point of finding one.

--Joey

-- 
"Living in the complex world of the future is somewhat
like having bees live in your head.  But, there they are."