diff --git a/accessible/windows/uia/UiaTextRange.cpp b/accessible/windows/uia/UiaTextRange.cpp index 0c0e365ea1a1..487d3b3830b2 100644 --- a/accessible/windows/uia/UiaTextRange.cpp +++ b/accessible/windows/uia/UiaTextRange.cpp @@ -14,11 +14,6 @@ #include #include -// Handle MinGW builds - see bug 1929755 for more info -#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW__) -# include "supplementalMinGWDefinitions.h" -#endif - namespace mozilla::a11y { template diff --git a/accessible/windows/uia/supplementalMinGWDefinitions.h b/accessible/windows/uia/supplementalMinGWDefinitions.h deleted file mode 100644 index 49bf2fbbfced..000000000000 --- a/accessible/windows/uia/supplementalMinGWDefinitions.h +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=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/. */ - -// This file is a shim designed to keep Gecko compiling while we wait for MinGW -// to add all of the various UIA attributes we need. We should only include this -// file if compiling with MinGW. We should remove this file when MinGW adds the -// necessary definitions. See bug 1929755. - -#ifndef mozilla_a11y_supplementalMinGWDefinitions_h__ -#define mozilla_a11y_supplementalMinGWDefinitions_h__ - -// UIA Annotation Type Identifiers -#ifndef AnnotationType_Unknown -const long AnnotationType_Unknown = 60000; -#endif -#ifndef AnnotationType_SpellingError -const long AnnotationType_SpellingError = 60001; -#endif -#ifndef AnnotationType_GrammarError -const long AnnotationType_GrammarError = 60002; -#endif -#ifndef AnnotationType_Comment -const long AnnotationType_Comment = 60003; -#endif -#ifndef AnnotationType_FormulaError -const long AnnotationType_FormulaError = 60004; -#endif -#ifndef AnnotationType_TrackChanges -const long AnnotationType_TrackChanges = 60005; -#endif -#ifndef AnnotationType_Header -const long AnnotationType_Header = 60006; -#endif -#ifndef AnnotationType_Footer -const long AnnotationType_Footer = 60007; -#endif -#ifndef AnnotationType_Highlighted -const long AnnotationType_Highlighted = 60008; -#endif -#ifndef AnnotationType_Endnote -const long AnnotationType_Endnote = 60009; -#endif -#ifndef AnnotationType_Footnote -const long AnnotationType_Footnote = 60010; -#endif -#ifndef AnnotationType_InsertionChange -const long AnnotationType_InsertionChange = 60011; -#endif -#ifndef AnnotationType_DeletionChange -const long AnnotationType_DeletionChange = 60012; -#endif -#ifndef AnnotationType_MoveChange -const long AnnotationType_MoveChange = 60013; -#endif -#ifndef AnnotationType_FormatChange -const long AnnotationType_FormatChange = 60014; -#endif -#ifndef AnnotationType_UnsyncedChange -const long AnnotationType_UnsyncedChange = 60015; -#endif -#ifndef AnnotationType_EditingLockedChange -const long AnnotationType_EditingLockedChange = 60016; -#endif -#ifndef AnnotationType_ExternalChange -const long AnnotationType_ExternalChange = 60017; -#endif -#ifndef AnnotationType_ConflictingChange -const long AnnotationType_ConflictingChange = 60018; -#endif -#ifndef AnnotationType_Author -const long AnnotationType_Author = 60019; -#endif -#ifndef AnnotationType_AdvancedProofingIssue -const long AnnotationType_AdvancedProofingIssue = 60020; -#endif -#ifndef AnnotationType_DataValidationError -const long AnnotationType_DataValidationError = 60021; -#endif -#ifndef AnnotationType_CircularReferenceError -const long AnnotationType_CircularReferenceError = 60022; -#endif -#ifndef AnnotationType_Mathematics -const long AnnotationType_Mathematics = 60023; -#endif -#ifndef AnnotationType_Sensitive -const long AnnotationType_Sensitive = 60024; -#endif - -// UIA Style Identifiers -const long StyleId_Custom = 70000; -const long StyleId_Heading1 = 70001; -const long StyleId_Heading2 = 70002; -const long StyleId_Heading3 = 70003; -const long StyleId_Heading4 = 70004; -const long StyleId_Heading5 = 70005; -const long StyleId_Heading6 = 70006; -const long StyleId_Heading7 = 70007; -const long StyleId_Heading8 = 70008; -const long StyleId_Heading9 = 70009; -const long StyleId_Title = 70010; -const long StyleId_Subtitle = 70011; -const long StyleId_Normal = 70012; -const long StyleId_Emphasis = 70013; -const long StyleId_Quote = 70014; -const long StyleId_BulletedList = 70015; -const long StyleId_NumberedList = 70016; - -#endif // mozilla_a11y_supplementalMinGWDefinitions_h__ diff --git a/ipc/mscom/AgileReference.cpp b/ipc/mscom/AgileReference.cpp index 76fe773b0a23..6cf051e26844 100644 --- a/ipc/mscom/AgileReference.cpp +++ b/ipc/mscom/AgileReference.cpp @@ -12,17 +12,6 @@ #if defined(__MINGW32__) -// Declarations from Windows SDK specific to Windows 8.1 - -enum AgileReferenceOptions { - AGILEREFERENCE_DEFAULT = 0, - AGILEREFERENCE_DELAYEDMARSHAL = 1, -}; - -HRESULT WINAPI RoGetAgileReference(AgileReferenceOptions options, REFIID riid, - IUnknown* pUnk, - IAgileReference** ppAgileReference); - // Unfortunately, at time of writing, MinGW doesn't know how to statically link // to RoGetAgileReference. On these builds only, we substitute a runtime-linked // function pointer. diff --git a/taskcluster/kinds/fetch/toolchains.yml b/taskcluster/kinds/fetch/toolchains.yml index 6f6e9e6326c8..3a43022379c8 100644 --- a/taskcluster/kinds/fetch/toolchains.yml +++ b/taskcluster/kinds/fetch/toolchains.yml @@ -311,7 +311,7 @@ mingw-w64: fetch: type: git repo: https://git.code.sf.net/p/mingw-w64/mingw-w64 - revision: c0313ec3381521db6c5e3aca746ff1e3e29208d7 + revision: 3346c0eb95c34e2ac0c5f157da8965ee292c64e8 mingw-w64-trunk: description: mingw-w64 master branch source code diff --git a/widget/windows/JumpListBuilder.cpp b/widget/windows/JumpListBuilder.cpp index cf9118a424af..34943b25a9ca 100644 --- a/widget/windows/JumpListBuilder.cpp +++ b/widget/windows/JumpListBuilder.cpp @@ -18,17 +18,6 @@ #include "nsServiceManagerUtils.h" #include "WinUtils.h" -#ifdef __MINGW32__ -// The PKEY_Link_Arguments property key does not exist in the MINGW32 -// build configuration, so we define it ourselves here. -# define INITGUID // This alters the behavior of DEFINE_PROPERTYKEY so that - // we define PKEY_Link_Arguments rather than declare it. -# include // For DEFINE_PROPERTYKEY() definition -DEFINE_PROPERTYKEY(PKEY_Link_Arguments, 0x436F2667, 0x14E2, 0x4FEB, 0xB3, 0x0A, - 0x14, 0x6C, 0x53, 0xB5, 0xB6, 0x74, 100); -# undef INITGUID -#endif - using mozilla::dom::Promise; using mozilla::dom::WindowsJumpListShortcutDescription; diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp index 2b711a50b3f1..a56585f497df 100644 --- a/xpcom/base/AvailableMemoryTracker.cpp +++ b/xpcom/base/AvailableMemoryTracker.cpp @@ -33,19 +33,6 @@ Atomic sNumLowPhysicalMemEvents; namespace { #if defined(XP_WIN) - -# if defined(__MINGW32__) -// Definitions for heap optimization that require the Windows SDK to target the -// Windows 8.1 Update -static const HEAP_INFORMATION_CLASS HeapOptimizeResources = - static_cast(3); - -typedef struct _HEAP_OPTIMIZE_RESOURCES_INFORMATION { - DWORD Version; - DWORD Flags; -} HEAP_OPTIMIZE_RESOURCES_INFORMATION, *PHEAP_OPTIMIZE_RESOURCES_INFORMATION; -# endif - static int64_t LowMemoryEventsPhysicalDistinguishedAmount() { return sNumLowPhysicalMemEvents; }