Mercurial > mplayer.hg

changeset 12531:834e7844ab3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MinGW compilation fix from a patch by Joey Parrish, approved by Sascha
author diego
date Thu, 03 Jun 2004 13:30:55 +0000
parents 773ad7374436
children 79a2af950cf7
files libmpdemux/demux_rtp.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.cpp	Thu Jun 03 12:41:56 2004 +0000
+++ b/libmpdemux/demux_rtp.cpp	Thu Jun 03 13:30:55 2004 +0000
@@ -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"
 }