Bug 815581 - Fixed accessible compilation on mingw r=trev.saunders

dothq · Nov 28, 2012 · 7a23ef3 · 7a23ef3
1 parent 645ae33
commit 7a23ef3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/accessible/public/msaa/nsIWinAccessNode.idl b/accessible/public/msaa/nsIWinAccessNode.idl
@@ -7,7 +7,7 @@
 #include "nsISupports.idl"
 
 %{C++
-#include "Guiddef.h"
+#include "guiddef.h"
 %}
 
 [ref] native MSCOMIIDRef(IID);

diff --git a/accessible/src/msaa/AccessibleWrap.cpp b/accessible/src/msaa/AccessibleWrap.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccessibleWrap.h"
+#include "Accessible-inl.h"
 
 #include "Compatibility.h"
 #include "DocAccessible-inl.h"
@@ -41,7 +42,7 @@
 #include "Accessible2_i.c"
 #include "AccessibleRole.h"
 #include "AccessibleStates.h"
-#include "OLEACC.H"
+#include "oleacc.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -1376,7 +1377,7 @@ AccessibleWrap::get_uniqueID(long *uniqueID)
 {
   A11Y_TRYBLOCK_BEGIN
 
-  *uniqueID = - reinterpret_cast<long>(UniqueID());
+  *uniqueID = - reinterpret_cast<intptr_t>(UniqueID());
   return S_OK;
 
   A11Y_TRYBLOCK_END

diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h
@@ -10,7 +10,7 @@
 
 #include "HyperTextAccessible.h"
 #include "ia2AccessibleEditableText.h"
-#include "ia2AccessibleHyperText.h"
+#include "ia2AccessibleHypertext.h"
 
 namespace mozilla {
 namespace a11y {

diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h
@@ -15,7 +15,9 @@
 // uses SEH and 'xpAccessible' has destructor
 // At this point we're catching a crash which is of much greater
 // importance than the missing dereference for the nsCOMPtr<>
+#ifdef _MSC_VER
 #pragma warning( disable : 4509 )
+#endif
 
 #include "nsCOMPtr.h"
 #include "nsIAccessible.h"
@@ -24,8 +26,8 @@
 #include "nsIDOMElement.h"
 #include "nsIContent.h"
 #include "nsAccessNode.h"
-#include "OLEIDL.H"
-#include "OLEACC.H"
+#include "oleidl.h"
+#include "oleacc.h"
 #include <winuser.h>
 #ifdef MOZ_CRASHREPORTER
 #include "nsICrashReporter.h"
@@ -47,6 +49,13 @@ namespace a11y {
 
 class AccTextChangeEvent;
 
+#ifdef __GNUC__
+// Inheriting from both XPCOM and MSCOM interfaces causes a lot of warnings
+// about virtual functions being hidden by each other. This is done by
+// design, so silence the warning.
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#endif
+
 class nsAccessNodeWrap : public nsAccessNode,
                          public nsIWinAccessNode,
                          public IServiceProvider

diff --git a/accessible/src/windows/ia2/ia2AccessibleValue.cpp b/accessible/src/windows/ia2/ia2AccessibleValue.cpp
@@ -10,6 +10,7 @@
 #include "AccessibleValue_i.c"
 
 #include "AccessibleWrap.h"
+#include "Accessible-inl.h"
 
 using namespace mozilla::a11y;
 

diff --git a/accessible/src/windows/uia/uiaRawElmProvider.cpp b/accessible/src/windows/uia/uiaRawElmProvider.cpp
@@ -72,7 +72,7 @@ uiaRawElmProvider::GetRuntimeId(__RPC__deref_out_opt SAFEARRAY** aRuntimeIds)
   if (!aRuntimeIds)
     return E_INVALIDARG;
 
-  int ids[] = { UiaAppendRuntimeId, reinterpret_cast<int>(mAcc->UniqueID()) };
+  int ids[] = { UiaAppendRuntimeId, static_cast<int>(reinterpret_cast<intptr_t>(mAcc->UniqueID())) };
   *aRuntimeIds = SafeArrayCreateVector(VT_I4, 0, 2);
   if (!*aRuntimeIds)
     return E_OUTOFMEMORY;

diff --git a/accessible/src/windows/uia/uiaRawElmProvider.h b/accessible/src/windows/uia/uiaRawElmProvider.h
@@ -9,7 +9,7 @@
 
 #include "objbase.h"
 #include "AccessibleWrap.h"
-#include "UIAutomation.h"
+#include "uiautomation.h"
 
 namespace mozilla {
 namespace a11y {