Alexandre Julliard : include: Don't define uuids in amvideo. idl as that conflicts with uuids.h

Alexandre Julliard julliard at winehq.org
Tue Jul 8 14:35:09 CDT 2008


Module: wine
Branch: master
Commit: d753c6eb0f9c9f171fd237977e3dabe931f1f56a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d753c6eb0f9c9f171fd237977e3dabe931f1f56a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jul  8 17:51:32 2008 +0200

include: Don't define uuids in amvideo.idl as that conflicts with uuids.h

---

 include/amvideo.idl |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/amvideo.idl b/include/amvideo.idl
index 3750958..37d06ff 100644
--- a/include/amvideo.idl
+++ b/include/amvideo.idl
@@ -61,7 +61,7 @@ cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)")
 
 [
     object,
-    uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a),
+    /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -87,7 +87,7 @@ interface IDirectDrawVideo : IUnknown
 
 [
     object,
-    uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3),
+    /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -103,7 +103,7 @@ interface IQualProp : IUnknown
 
 [
     object,
-    uuid(dd1d7110-7836-11cf-bf47-00aa0055595a),
+    /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a)  conflicts with uuids.h */
     pointer_default(unique)
 ]
 interface IFullScreenVideo : IUnknown
@@ -129,7 +129,7 @@ interface IFullScreenVideo : IUnknown
 
 [
     object,
-    uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6),
+    /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -144,7 +144,7 @@ interface IFullScreenVideoEx : IFullScreenVideo
 
 [
     object,
-    uuid(61ded640-e912-11ce-a099-00aa00479a58),
+    /* uuid(61ded640-e912-11ce-a099-00aa00479a58)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]




More information about the wine-cvs mailing list