From 19cf857451f80b58f395b0a7a71fcb847e44083b Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 3 Jun 2004 13:30:55 +0000 Subject: MinGW compilation fix from a patch by Joey Parrish, approved by Sascha git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12532 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_rtp.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmpdemux/demux_rtp.cpp') diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 5a0c8a32be..5fd47f7498 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -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, but not the other way around. +#endif #include "demux_rtp.h" #include "stheader.h" } -- cgit v1.2.3