Bug 1413868 - Fix broken mingw-w64 build. r=froydnj, a=RyanVM FIREFOX_52_9_0esr_BUILD2 FIREFOX_52_9_0esr_RELEASE
authorGeorg Koppen <gk@torproject.org>
Wed, 20 Jun 2018 09:32:05 +0200
changeset 357251 755067c14b06f36f28450311e5c4a9aa9132dae5
parent 357250 068e249d02b4aa3f34e536b4fcd4df3aa9c11e47
child 357252 3e43a130e1743bd8986c99bdb9d2f2bc914f5463
push id7750
push userryanvm@gmail.com
push dateThu, 21 Jun 2018 13:39:46 +0000
treeherdermozilla-esr52@755067c14b06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, RyanVM
bugs1413868
milestone52.9.0
Bug 1413868 - Fix broken mingw-w64 build. r=froydnj, a=RyanVM
xpcom/io/FilePreferences.cpp
xpcom/io/moz.build
--- a/xpcom/io/FilePreferences.cpp
+++ b/xpcom/io/FilePreferences.cpp
@@ -5,16 +5,17 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "FilePreferences.h"
 
 #include "mozilla/Preferences.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace FilePreferences {
 
 static bool sBlockUNCPaths = false;
 typedef nsTArray<nsString> Paths;
 
 static Paths& PathArray()
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -88,17 +88,16 @@ EXPORTS.mozilla += [
     'SnappyCompressOutputStream.h',
     'SnappyFrameUtils.h',
     'SnappyUncompressInputStream.h',
 ]
 
 UNIFIED_SOURCES += [
     'Base64.cpp',
     'crc32c.c',
-    'FilePreferences.cpp',
     'nsAnonymousTemporaryFile.cpp',
     'nsAppFileLocationProvider.cpp',
     'nsBinaryStream.cpp',
     'nsDirectoryService.cpp',
     'nsEscape.cpp',
     'nsInputStreamTee.cpp',
     'nsIOUtil.cpp',
     'nsLinebreakConverter.cpp',
@@ -116,16 +115,20 @@ UNIFIED_SOURCES += [
     'nsWildCard.cpp',
     'SlicedInputStream.cpp',
     'SnappyCompressOutputStream.cpp',
     'SnappyFrameUtils.cpp',
     'SnappyUncompressInputStream.cpp',
     'SpecialSystemDirectory.cpp',
 ]
 
+SOURCES += [
+    'FilePreferences.cpp',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'CocoaFileUtils.mm',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'