diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-03 13:30:55 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-03 13:30:55 +0000 |
| commit | 19cf857451f80b58f395b0a7a71fcb847e44083b (patch) | |
| tree | e44737d3f4dee0a8b39aabb538ecc15fb6aff510 /libmpdemux/demux_rtp.cpp | |
| parent | 19967c3f8feeeb6cf9eaecc3d4bef1a1529732f8 (diff) | |
| download | mpv-19cf857451f80b58f395b0a7a71fcb847e44083b.tar.bz2 mpv-19cf857451f80b58f395b0a7a71fcb847e44083b.tar.xz | |
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
Diffstat (limited to 'libmpdemux/demux_rtp.cpp')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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> // windows.h, but not the other way around. +#endif #include "demux_rtp.h" #include "stheader.h" } |