include: shldisp.idl should only import ocidl.idl.

Francois Gouget fgouget at
Thu Dec 15 13:32:28 CST 2011


The PSDK's header only references one header for imported files: 
ocidl.h. This is probably essentially equivalent to the set of idl files 
we import but I still think our idl file should only import ocidl.idl to 

That way we will get the expected header dependencies so the code that 
depends on it gets exactly the definitions it's supposed to (not too 
much, could cause conflicts, and not too little, missing definitions 
cause compilation errors too). That way we will also notice if our 
ocidl.idl is missing stuff that shldisp.idl needs.

 include/shldisp.idl |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/include/shldisp.idl b/include/shldisp.idl
index 5c04f71..3e7fc45 100644
--- a/include/shldisp.idl
+++ b/include/shldisp.idl
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-import "objidl.idl";
-import "oleidl.idl";
-import "oaidl.idl";
-import "shtypes.idl";
-import "servprov.idl";
-import "comcat.idl";
+import "ocidl.idl";
 #include <shdispid.h>

More information about the wine-patches mailing list