|
|
@@ -1,21 +1,22 @@
|
|
|
# HG changeset patch
|
|
|
# User Tom Ritter <tom@mozilla.com>
|
|
|
-# Date 1541183751 18000
|
|
|
-# Fri Nov 02 13:35:51 2018 -0500
|
|
|
-# Node ID d1c9b0924148c651f61c8305e71d21670876a472
|
|
|
-# Parent c252ee022df2fca84965146d81210fb309a89c31
|
|
|
-Bug 1475566 - Disable #pragma comments for MinGW Builds. r=glandium, a=lizzard
|
|
|
+# Date 1535514639 0
|
|
|
+# Node ID 14f703675b64439b423164643ce22f93984ea949
|
|
|
+# Parent 9555548c9a911929f18239003263b2d2ac209e7c
|
|
|
+Bug 1475566 Disable #pragma comments for MinGW Builds r=glandium
|
|
|
|
|
|
-In the MinGW browser build job, we're going to use -fms-extensions, which will tell
|
|
|
-clang to start processing these comments. Clang cannot process them correctly
|
|
|
-(it's an upstream bug) but it doesn't need to, because we include the libs we need
|
|
|
-in moz.build files.
|
|
|
+In the MinGW browser build job, we're going to use -fms-extensions,
|
|
|
+which will tell clang to start processing these comments. Clang
|
|
|
+cannot process them correctly (it's an upstream bug) but it doesn't
|
|
|
+need to, because we include the libs we need in moz.build files.
|
|
|
|
|
|
-So we exclude them for MinGW builds. mingw-clang gets them wrong and mingw-gcc
|
|
|
-(which doesn't even work anymore on -central) ignored them.
|
|
|
+So we exclude them for MinGW builds. mingw-clang gets them wrong and
|
|
|
+mingw-gcc (which doesn't even work anymore on -central) ignored them.
|
|
|
|
|
|
-In the future, with a llvm fix, we could clean up the moz.build files and re-enable
|
|
|
-these comments.
|
|
|
+In the future, with a llvm fix, we could clean up the moz.build
|
|
|
+files and re-enable these comments.
|
|
|
+
|
|
|
+Differential Revision: https://phabricator.services.mozilla.com/D3527
|
|
|
|
|
|
diff --git a/ipc/chromium/src/base/time_win.cc b/ipc/chromium/src/base/time_win.cc
|
|
|
--- a/ipc/chromium/src/base/time_win.cc
|
|
|
@@ -114,6 +115,47 @@ diff --git a/toolkit/components/maintenanceservice/workmonitor.cpp b/toolkit/com
|
|
|
#include "serviceinstall.h"
|
|
|
#include "servicebase.h"
|
|
|
#include "registrycertificates.h"
|
|
|
+diff --git a/toolkit/system/windowsDHCPClient/WindowsNetworkFunctionsWrapper.cpp.1475566.later b/toolkit/system/windowsDHCPClient/WindowsNetworkFunctionsWrapper.cpp.1475566.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/system/windowsDHCPClient/WindowsNetworkFunctionsWrapper.cpp.1475566.later
|
|
|
+@@ -0,0 +1,36 @@
|
|
|
++--- WindowsNetworkFunctionsWrapper.cpp
|
|
|
+++++ WindowsNetworkFunctionsWrapper.cpp
|
|
|
++@@ -1,19 +1,20 @@
|
|
|
++ /* -*- 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/. */
|
|
|
++
|
|
|
++ #include "WindowsNetworkFunctionsWrapper.h"
|
|
|
++
|
|
|
++-
|
|
|
+++#ifndef __MINGW32__
|
|
|
++ #pragma comment(lib, "IPHLPAPI.lib")
|
|
|
++ #pragma comment(lib, "dhcpcsvc.lib" )
|
|
|
+++#endif
|
|
|
++
|
|
|
++ namespace mozilla {
|
|
|
++ namespace toolkit {
|
|
|
++ namespace system {
|
|
|
++ namespace windowsDHCPClient {
|
|
|
++
|
|
|
++ NS_IMPL_ISUPPORTS(WindowsNetworkFunctionsWrapper, nsISupports)
|
|
|
++
|
|
|
++@@ -38,9 +39,9 @@ DWORD WindowsNetworkFunctionsWrapper::Dh
|
|
|
++ _Inout_ LPDWORD apSize,
|
|
|
++ _In_ LPWSTR aRequestIdStr)
|
|
|
++ {
|
|
|
++ return DhcpRequestParams(aFlags, aReserved, aAdapterName, aClassId, aSendParams, aRecdParams, aBuffer, apSize, aRequestIdStr);
|
|
|
++ }
|
|
|
++ } // namespace windowsDHCPClient
|
|
|
++ } // namespace system
|
|
|
++ } // namespace toolkit
|
|
|
++-} // namespace mozilla
|
|
|
++\ No newline at end of file
|
|
|
+++} // namespace mozilla
|
|
|
diff --git a/toolkit/xre/nsWindowsRestart.cpp b/toolkit/xre/nsWindowsRestart.cpp
|
|
|
--- a/toolkit/xre/nsWindowsRestart.cpp
|
|
|
+++ b/toolkit/xre/nsWindowsRestart.cpp
|
Ian Neal