From 419e55b8e0fa77995bb99542e94e4c9dd6a27a72 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Mon, 12 May 2008 09:25:13 +0100
Subject: [PATCH] include: Don't import files in control.idl that aren't
 imported on Windows.

---
 include/axcore.idl  |  4 ++++
 include/control.idl | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/axcore.idl b/include/axcore.idl
index bb9f5e701ed..52e695935be 100644
--- a/include/axcore.idl
+++ b/include/axcore.idl
@@ -48,7 +48,11 @@ cpp_quote("#define MAX_PIN_NAME    128")
 cpp_quote("#define MAX_FILTER_NAME 128")
 
 typedef LONGLONG REFERENCE_TIME;
+
+cpp_quote("#ifndef REFTIME_DEFINED")
+cpp_quote("#define REFTIME_DEFINED")
 typedef DOUBLE REFTIME;
+cpp_quote("#endif")
 
 typedef DWORD_PTR HSEMAPHORE;
 typedef DWORD_PTR HEVENT;
diff --git a/include/control.idl b/include/control.idl
index 78316403941..4b03cb2a2a5 100644
--- a/include/control.idl
+++ b/include/control.idl
@@ -17,10 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-cpp_quote("#if 0")  /* FIXME: these files are not included on Windows */
-import "shldisp.idl";
-import "strmif.idl";
-cpp_quote("#endif")
+import "oaidl.idl";
 
 interface IMediaControl;
 interface IBasicAudio;
@@ -34,6 +31,11 @@ typedef long OAFilterState;
 typedef LONG_PTR OAHWND;
 typedef LONG_PTR OAEVENT;
 
+cpp_quote("#ifndef REFTIME_DEFINED")
+cpp_quote("#define REFTIME_DEFINED")
+typedef DOUBLE REFTIME;
+cpp_quote("#endif")
+
 /*****************************************************************************
  * IMediaControl interface
  */
-- 
2.11.4.GIT