Maarten Lankhorst : includes: Fix header conflicts against REFERENCE_TIME.
Alexandre Julliard
julliard at winehq.org
Mon Feb 1 08:56:03 CST 2010
Module: wine
Branch: master
Commit: 08514e9e1c547156ad0fd674410dd82eb69af130
URL: http://source.winehq.org/git/wine.git/?a=commit;h=08514e9e1c547156ad0fd674410dd82eb69af130
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Sat Jan 30 11:14:00 2010 +0100
includes: Fix header conflicts against REFERENCE_TIME.
---
include/axcore.idl | 3 +++
include/ksmedia.h | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/axcore.idl b/include/axcore.idl
index 52e6959..66746d5 100644
--- a/include/axcore.idl
+++ b/include/axcore.idl
@@ -47,7 +47,10 @@ typedef enum _PinDirection
cpp_quote("#define MAX_PIN_NAME 128")
cpp_quote("#define MAX_FILTER_NAME 128")
+cpp_quote("#ifndef REFERENCE_TIME_DEFINED")
+cpp_quote("#define REFERENCE_TIME_DEFINED")
typedef LONGLONG REFERENCE_TIME;
+cpp_quote("#endif")
cpp_quote("#ifndef REFTIME_DEFINED")
cpp_quote("#define REFTIME_DEFINED")
diff --git a/include/ksmedia.h b/include/ksmedia.h
index 4dfe058..c78aa91 100644
--- a/include/ksmedia.h
+++ b/include/ksmedia.h
@@ -34,7 +34,10 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0
#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
#define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER)
+#ifndef REFERENCE_TIME_DEFINED
+#define REFERENCE_TIME_DEFINED
typedef LONGLONG REFERENCE_TIME;
+#endif
typedef enum
{
More information about the wine-cvs
mailing list