From a2ff8a9338440f30bbecff0a460ee7072fa38bd2 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Tue, 7 Dec 1999 23:01:28 +0000 Subject: [PATCH] Added a guard around the interface file to stop #include'ing exdisp.h before or after MozillaBrowser.h from breaking a build git-svn-id: svn://10.0.0.236/trunk@55632 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/embed/ActiveX/MozillaControl.idl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mozilla/webshell/embed/ActiveX/MozillaControl.idl b/mozilla/webshell/embed/ActiveX/MozillaControl.idl index ff83be352cf..5c19af65e16 100644 --- a/mozilla/webshell/embed/ActiveX/MozillaControl.idl +++ b/mozilla/webshell/embed/ActiveX/MozillaControl.idl @@ -23,9 +23,14 @@ library MOZILLACONTROLLib importlib("stdole32.tlb"); importlib("stdole2.tlb"); + // Stop interfaces and other bits from being redefined by the IE header file + + cpp_quote("#ifndef __exdisp_h__") + cpp_quote("#define __exdisp_h__") + // NOTE: There is a very specific reason for repeating the IWebBrowser - // verbatim rather than import'ing exdisp.idl - it stops MIDL - // failing with a MIDL2020 error! + // and other bits verbatim rather than import'ing exdisp.idl - + // MIDL fails with a MIDL2020 error if we try that! [ uuid(EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B), // IID_IWebBrowser @@ -423,4 +428,6 @@ library MOZILLACONTROLLib [source] dispinterface DWebBrowserEvents; [default, source] dispinterface DWebBrowserEvents2; }; + + cpp_quote("#endif") };