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

[Ross Finlayson]

At 05:19 PM 4/19/04, Joey Parrish 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>

The code currently says:
#if defined(__WIN32__) || defined(_WIN32)
#include <strstrea.h>
#else
#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
#include <strstream>
#else
#include <strstream.h>
#endif
#endif

I want VC++ users to continue to get <strstea.h>.  Is there a way to change 
this so that it will work properly for both VC++ and mingw?

2/ The
         #include <ws2tcpip.h>
in "GroupsockHelper.hh".  Note that <ws2tcpip.h> is already included in 
"NetCommon.h":
#elif defined(__WIN32__) || defined(_WIN32)
/* Windows */
#if defined(_WINNT) || defined(__BORLANDC__)
#define _MSWSOCK_
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
#include <windows.h>
...

Can this be modified so that the correct file(s) get included for mingw 
(but no change for VC++)?

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?


	Ross Finlayson
	LIVE.COM
	<http://www.live.com/>