[MPlayer-cvslog] r27496 - in trunk/stream: asf_mmst_streaming.c asf_streaming.c http.c librtsp/rtsp_session.c network.c network.h pnm.c rtp.c stream.c stream_ftp.c stream_netstream.c stream_rtsp.c tcp.c udp.c

[Diego Biurrun]

On Sun, Aug 31, 2008 at 10:29:28AM +0200, Dominik 'Rathann' Mierzejewski wrote:
> On Saturday, 30 August 2008 at 18:21, Zuxy Meng wrote:
> > "JonY" <10walls at gmail.com> 写入消息新闻:48B96416.4040206 at gmail.com...
> > > diego wrote:
> > >>
> > >> Log:
> > >> Move duplicated '#define closesocket close' into network.h along with
> > >> network-related #include #ifdeffery.
> > >
> > > It looks like one of the hunks broke MinGW build.
> > >
> > > libmpdemux and the codecs under it cannot be compiled properly because
> > > definitions from "./loader/wine/*.h" is conflicting with the native
> > > headers. Conflicts with "loader/wine/windef.h" is especially visible.
> > >
> > > "ad_internal.h", used by many of the files under libmpdemux includes
> > > "stream/stream.h", which then includes "stream/network.h" if
> > > "CONFIG_NETWORK" is defined, which then in turn includes the native
> > > "ws2tcpip.h".
> > >
> > > r27495 builds with minor workarounds (read: local hacks) for
> > > HAVE_WINSOCK2_H and closesockets.
> > >
> > > Any ideas to fix the problem?
> > 
> > I'd say we'd better revert this mess first.
> 
> Why don't we have a look at the exact compilation failures first?
> The original commit was a major cleanup and I'd hate to see it
> reverted if it can be easily fixed.

I agree in principle, but this seems to be too much trouble in this
case.  I have a different idea for the cleanup, which I will implement
in a moment after I revert this.

Diego