Bug 1430149 - Don't define INITGUID when not needed. r=aklotz, a=jcristau
authorJacek Caban <jacek@codeweavers.com>
Tue, 25 Dec 2018 18:49:39 +0100
changeset 450853 fe547fe73bba411951fa314ed473336844dbe79f
parent 450852 35d886531689702d2924fa1b22438af6fdef2dcf
child 450854 3e18d1aa6c318467e341d891155b458b56c8f64c
push id301
push userjcristau@mozilla.com
push dateThu, 17 Jan 2019 14:20:19 +0000
treeherdermozilla-esr60@c7cba7f60631 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz, jcristau
bugs1430149
milestone60.4.1
Bug 1430149 - Don't define INITGUID when not needed. r=aklotz, a=jcristau On mingw this causes IIDs to be defined in headers. Those definitions conflict with _i.c files that are included as well. Since we include _i.c anyway, INITGUID is simply not needed.
accessible/ipc/win/HandlerProvider.cpp
accessible/ipc/win/handler/AccessibleHandler.cpp
--- a/accessible/ipc/win/HandlerProvider.cpp
+++ b/accessible/ipc/win/HandlerProvider.cpp
@@ -1,16 +1,14 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define INITGUID
-
 #include "mozilla/a11y/HandlerProvider.h"
 
 #include "Accessible2_3.h"
 #include "AccessibleDocument.h"
 #include "AccessibleRelation.h"
 #include "AccessibleTable.h"
 #include "AccessibleTable2.h"
 #include "AccessibleTableCell.h"
--- a/accessible/ipc/win/handler/AccessibleHandler.cpp
+++ b/accessible/ipc/win/handler/AccessibleHandler.cpp
@@ -3,18 +3,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if defined(MOZILLA_INTERNAL_API)
 #error This code is NOT for internal Gecko use!
 #endif  // defined(MOZILLA_INTERNAL_API)
 
-#define INITGUID
-
 #include "AccessibleHandler.h"
 #include "AccessibleHandlerControl.h"
 #include "HandlerChildEnumerator.h"
 #include "HandlerRelation.h"
 
 #include "Factory.h"
 #include "HandlerData.h"
 #include "mozilla/ArrayUtils.h"