From: Damien Fouilleul <damienf@videolan.org>
Date: Wed, 6 Dec 2006 23:39:18 +0000 (+0000)
Subject: - dshow: backporting from 0.8.6
X-Git-Tag: 0.9.0-test0~9055
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=344289ceca2caa3ede3dbc0c443907c265d0c2b2;p=vlc

- dshow: backporting from 0.8.6
---

diff --git a/modules/access/dshow/common.h b/modules/access/dshow/common.h
index b1103ea97d..4b69d7e679 100644
--- a/modules/access/dshow/common.h
+++ b/modules/access/dshow/common.h
@@ -34,6 +34,9 @@ using namespace std;
 #   include <unknwn.h>
 #   include <ole2.h>
 #   include <limits.h>
+#   ifdef _WINGDI_
+#      undef _WINGDI_
+#   endif
 #   define _WINGDI_ 1
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 6c60686ba4..f47757cdc1 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index 41236212db..73bea53f6f 100644
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -34,6 +34,9 @@ using namespace std;
 #   include <unknwn.h>
 #   include <ole2.h>
 #   include <limits.h>
+#   ifdef _WINGDI_
+#      undef _WINGDI_
+#   endif
 #   define _WINGDI_ 1
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_