Francois Gouget : include: Some DirectX headers are supposed to define COM_NO_WINDOWS_H.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Tue Nov  7 00:45:16 2006 +0100

include: Some DirectX headers are supposed to define COM_NO_WINDOWS_H.

---

 include/d3d.h      |    2 ++
 include/d3d8.h     |    1 +
 include/d3d9.h     |    1 +
 include/ddraw.h    |    1 +
 include/dinput.h   |    1 +
 include/dmplugin.h |    1 +
 include/dmusicc.h  |    1 +
 include/dmusicf.h  |    1 +
 include/dmusici.h  |    1 +
 9 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/d3d.h b/include/d3d.h
index a897227..76237d7 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -20,6 +20,8 @@ #ifndef __WINE_D3D_H
 #define __WINE_D3D_H
 
 #include <stdlib.h>
+
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <d3dtypes.h> /* must precede d3dcaps.h */
 #include <d3dcaps.h>
diff --git a/include/d3d8.h b/include/d3d8.h
index 75d1810..8b7ea53 100644
--- a/include/d3d8.h
+++ b/include/d3d8.h
@@ -23,6 +23,7 @@ #ifndef DIRECT3D_VERSION
 #define DIRECT3D_VERSION  0x0800
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d8types.h>
diff --git a/include/d3d9.h b/include/d3d9.h
index 2cc9012..2575dbe 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -24,6 +24,7 @@ #ifndef DIRECT3D_VERSION
 #define DIRECT3D_VERSION  0x0900
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d9types.h>
diff --git a/include/ddraw.h b/include/ddraw.h
index b8a28ce..f92d479 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -19,6 +19,7 @@
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #ifdef __cplusplus
diff --git a/include/dinput.h b/include/dinput.h
index f6e766b..e8c5658 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -19,6 +19,7 @@
 #ifndef __WINE_DINPUT_H
 #define __WINE_DINPUT_H
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #ifndef DIRECTINPUT_VERSION
diff --git a/include/dmplugin.h b/include/dmplugin.h
index 76b06c8..28a38f5 100644
--- a/include/dmplugin.h
+++ b/include/dmplugin.h
@@ -25,6 +25,7 @@ #ifndef __WINESRC__
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <dmusici.h>
diff --git a/include/dmusicc.h b/include/dmusicc.h
index 87d9e76..369774b 100644
--- a/include/dmusicc.h
+++ b/include/dmusicc.h
@@ -24,6 +24,7 @@ #ifndef __WINESRC__
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 
diff --git a/include/dmusicf.h b/include/dmusicf.h
index a568b04..8c12a28 100644
--- a/include/dmusicf.h
+++ b/include/dmusicf.h
@@ -25,6 +25,7 @@ #ifndef __WINESRC__
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <pshpack8.h>
diff --git a/include/dmusici.h b/include/dmusici.h
index 5403877..42ba6dd 100644
--- a/include/dmusici.h
+++ b/include/dmusici.h
@@ -27,6 +27,7 @@ #else
 #include <oleauto.h> /* VARIANT */
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <dmusicc.h>