Rob Shearman : include: Don't import files in control.idl that aren' t imported on Windows.
Alexandre Julliard
julliard at winehq.org
Wed Jun 25 16:44:37 CDT 2008
Module: wine
Branch: master
Commit: 088b3748d4903c892f793c1f3c64cc9fdc7f8c4d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=088b3748d4903c892f793c1f3c64cc9fdc7f8c4d
Author: Rob Shearman <robertshearman at gmail.com>
Date: Wed Jun 25 18:29:06 2008 +0100
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 bb9f5e7..52e6959 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 af8a2f9..ddb5279 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
*/
More information about the wine-cvs
mailing list