[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp.cpp,1.24,1.25

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv5009/libmpdemux

Modified Files:
	demux_rtp.cpp 
Log Message:
MinGW compilation fix from a patch by Joey Parrish, approved by Sascha


Index: demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- demux_rtp.cpp	2 Jun 2004 06:48:25 -0000	1.24
+++ demux_rtp.cpp	3 Jun 2004 13:30:55 -0000	1.25
@@ -2,6 +2,10 @@
 ////////// and the "LIVE.COM Streaming Media" libraries:
 
 extern "C" {
+// on MinGW, we must include windows.h before the things it conflicts
+#ifdef __MINGW32__    // with.  they are each protected from
+#include <windows.h>  // windows.h, but not the other way around.
+#endif
 #include "demux_rtp.h"
 #include "stheader.h"
 }