Alexandre Julliard : include: Add DO_NO_IMPORTS ifdefs where needed.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun  8 15:49:36 2007 +0200

include: Add DO_NO_IMPORTS ifdefs where needed.

---

 include/activscp.idl |    2 ++
 include/comcat.idl   |    2 ++
 include/dispex.idl   |    2 ++
 include/mlang.idl    |    2 ++
 include/msxml.idl    |    3 ++-
 include/oaidl.idl    |    2 ++
 include/objidl.idl   |    2 ++
 include/objsafe.idl  |    2 ++
 include/ocidl.idl    |    3 ++-
 include/oleidl.idl   |    2 ++
 include/propidl.idl  |    3 ++-
 include/unknwn.idl   |    2 ++
 12 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/activscp.idl b/include/activscp.idl
index 1ccfc3d..248203e 100644
--- a/include/activscp.idl
+++ b/include/activscp.idl
@@ -16,9 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "ocidl.idl";
 import "oleidl.idl";
 import "oaidl.idl";
+#endif
  
 typedef enum tagSCRIPTSTATE {
     SCRIPTSTATE_UNINITIALIZED = 0,
diff --git a/include/comcat.idl b/include/comcat.idl
index 2df8cf0..010db7d 100644
--- a/include/comcat.idl
+++ b/include/comcat.idl
@@ -17,7 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 /*****************************************************************************
  * Types
diff --git a/include/dispex.idl b/include/dispex.idl
index 3ba6f74..5891f08 100644
--- a/include/dispex.idl
+++ b/include/dispex.idl
@@ -16,10 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "ocidl.idl";
 import "oleidl.idl";
 import "oaidl.idl";
 import "servprov.idl";
+#endif
 
 cpp_quote("#define fdexNameCaseSensitive       0x00000001L")
 cpp_quote("#define fdexNameEnsure              0x00000002L")
diff --git a/include/mlang.idl b/include/mlang.idl
index 96e96fa..c76826a 100644
--- a/include/mlang.idl
+++ b/include/mlang.idl
@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 interface IStream;
 
diff --git a/include/msxml.idl b/include/msxml.idl
index 2d4ecc9..ff5cc49 100644
--- a/include/msxml.idl
+++ b/include/msxml.idl
@@ -19,11 +19,12 @@
 
 #include <msxmldid.h>
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
 import "wtypes.idl";
 import "objidl.idl";
 import "oaidl.idl";
-
+#endif
 
 [
 local,
diff --git a/include/oaidl.idl b/include/oaidl.idl
index 7f2f701..7afc862 100644
--- a/include/oaidl.idl
+++ b/include/oaidl.idl
@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
+#endif
 
 interface IDispatch;
 interface ITypeInfo;
diff --git a/include/objidl.idl b/include/objidl.idl
index f7a5b12..0e869cb 100644
--- a/include/objidl.idl
+++ b/include/objidl.idl
@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 interface IStream;
 interface IEnumString;
diff --git a/include/objsafe.idl b/include/objsafe.idl
index 312ee24..76df444 100644
--- a/include/objsafe.idl
+++ b/include/objsafe.idl
@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 1")
 cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 2")
diff --git a/include/ocidl.idl b/include/ocidl.idl
index 9fe9517..6c33240 100644
--- a/include/ocidl.idl
+++ b/include/ocidl.idl
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "oleidl.idl";
 import "oaidl.idl";
 import "servprov.idl";
 import "urlmon.idl";
-
+#endif
 
 /*****************************************************************************
  * IOleControlTypes interface
diff --git a/include/oleidl.idl b/include/oleidl.idl
index 02aef43..169d83b 100644
--- a/include/oleidl.idl
+++ b/include/oleidl.idl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
+#endif
 
 interface IOleInPlaceActiveObject;
 
diff --git a/include/propidl.idl b/include/propidl.idl
index c041be9..a0d83be 100644
--- a/include/propidl.idl
+++ b/include/propidl.idl
@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
 import "oaidl.idl";
-
+#endif
 
 /*
  * Windows SDK braindamage alert
diff --git a/include/unknwn.idl b/include/unknwn.idl
index 0ae9dee..9071973 100644
--- a/include/unknwn.idl
+++ b/include/unknwn.idl
@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "wtypes.idl";
+#endif
 
 /* Interfaces */