Bug 1430149 - widl compatibility fixes. r=aklotz

widl can't handle generating the typelib without explicit importlib() in this case. This should be fixed in widl as well, but using importlib() in this case looks right anyway.
iaxat · Dec 25, 2018 · 28ddbf3 · 28ddbf3
1 parent facaa2f
commit 28ddbf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/accessible/ipc/win/handler/AccessibleHandler.h b/accessible/ipc/win/handler/AccessibleHandler.h
@@ -22,7 +22,7 @@
 #define IIDFOR(iface) __GENIID(iface)
 #define NEWEST_IA2_IID IIDFOR(NEWEST_IA2_INTERFACE)
 
-#if defined(__midl)
+#if defined(__midl) || defined(__WIDL__)
 
 import NEWEST_IA2_IDL;
 

diff --git a/accessible/ipc/win/handler/HandlerData.idl b/accessible/ipc/win/handler/HandlerData.idl
@@ -8,7 +8,7 @@
 #include "AccessibleHandler.h"
 
 import "ocidl.idl";
-import "ServProv.idl";
+import "servprov.idl";
 
 import "Accessible2_3.idl";
 import "AccessibleHypertext2.idl";
@@ -185,6 +185,8 @@ interface IGeckoBackChannel : IUnknown
 [uuid(1e545f07-f108-4912-9471-546827a80983)]
 library AccessibleHandlerTypeLib
 {
+  importlib("stdole2.tlb");
+
   /**
    * This definition is required in order for the handler implementation to
    * support IDispatch (aka Automation). This is used by interpreted language