Bug 1616999 - Move the ICU include to GTK OSPreferences. r=jfkthame
authorZibi Braniecki <zbraniecki@mozilla.com>
Fri, 21 Feb 2020 15:36:45 +0000
changeset 2648960 908b192e5bd660cbb74f98f8b6d8ec05a4c9181c
parent 2648959 c5a54dd0284e06265691100b8e53caec9453d8ee
child 2648961 fc61eb14ceee168bd68ae4fa5720ab96b60b727c
push id490874
push userdvarga@mozilla.com
push dateSat, 22 Feb 2020 10:42:44 +0000
treeherdertry@64a8e247759e [default view] [failures only]
reviewersjfkthame
bugs1616999
milestone75.0a1
Bug 1616999 - Move the ICU include to GTK OSPreferences. r=jfkthame Depends on D63563 Differential Revision: https://phabricator.services.mozilla.com/D63564
Cargo.lock
intl/locale/OSPreferences.h
intl/locale/gtk/OSPreferences_gtk.cpp
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1267,16 +1267,17 @@ dependencies = [
 name = "fluent-langneg-ffi"
 version = "0.1.0"
 dependencies = [
  "fluent-langneg",
  "nserror",
  "nsstring",
  "thin-vec",
  "unic-langid",
+ "unic-langid-ffi",
  "xpcom",
 ]
 
 [[package]]
 name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
--- a/intl/locale/OSPreferences.h
+++ b/intl/locale/OSPreferences.h
@@ -5,17 +5,16 @@
 
 #ifndef mozilla_intl_IntlOSPreferences_h__
 #define mozilla_intl_IntlOSPreferences_h__
 
 #include "mozilla/StaticPtr.h"
 #include "nsDataHashtable.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "unicode/uloc.h"
 
 #include "mozIOSPreferences.h"
 
 namespace mozilla {
 namespace intl {
 
 /**
  * OSPreferences API provides a set of methods for retrieving information from
--- a/intl/locale/gtk/OSPreferences_gtk.cpp
+++ b/intl/locale/gtk/OSPreferences_gtk.cpp
@@ -5,16 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <locale.h>
 #include "OSPreferences.h"
 #include "dlfcn.h"
 #include "glib.h"
 #include "gio/gio.h"
 
+#include "unicode/uloc.h"
+
 using namespace mozilla::intl;
 
 OSPreferences::OSPreferences() {}
 
 OSPreferences::~OSPreferences() {}
 
 bool OSPreferences::ReadSystemLocales(nsTArray<nsCString>& aLocaleList) {
   MOZ_ASSERT(aLocaleList.IsEmpty());