Commit 120505b9 authored by serge-sans-paille's avatar serge-sans-paille
Browse files

Bug 1824510 - Make intl/locale buildable outside of a unified build environment r=andi 

Differential Revision: https://phabricator.services.mozilla.com/D173610
parent 95a3a332

intl/locale/OSPreferences.cpp

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include "mozilla/ClearOnShutdown.h"

#include "mozilla/intl/DateTimePatternGenerator.h"

#include "mozilla/intl/DateTimeFormat.h"

#include "mozilla/intl/LocaleService.h"

#include "mozilla/Preferences.h"

#include "mozilla/Result.h"

#include "mozilla/Services.h"

#include "nsIObserverService.h"

intl/locale/android/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -11,5 +11,3 @@ FINAL_LIBRARY = "xul" 
LOCAL_INCLUDES += [

    "..",

]
 


REQUIRES_UNIFIED_BUILD = True

intl/locale/mac/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -10,5 +10,3 @@ FINAL_LIBRARY = "xul" 
LOCAL_INCLUDES += [

    "..",

]
 


REQUIRES_UNIFIED_BUILD = True

intl/locale/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -92,5 +92,3 @@ if CONFIG["COMPILE_ENVIRONMENT"]: 
        "!fluent_langneg_ffi_generated.h",

        "!unic_langid_ffi_generated.h",

    ]
 


REQUIRES_UNIFIED_BUILD = True

intl/locale/nsLanguageAtomService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ nsStaticAtom* nsLanguageAtomService::GetUncachedLanguageGroup( 
      langStr.Truncate(start.get() - langStr.BeginReading());

    }



    Locale loc;

    auto result = LocaleParser::TryParse(langStr, loc);

    intl::Locale loc;

    auto result = intl::LocaleParser::TryParse(langStr, loc);

    if (!result.isOk()) {

      // Did the author (wrongly) use '_' instead of '-' to separate subtags?

      // If so, fix it up and re-try parsing.
@@ -198,7 +198,7 @@ nsStaticAtom* nsLanguageAtomService::GetUncachedLanguageGroup( 


        // Throw away the partially parsed locale and re-start parsing.

        loc = {};

        result = LocaleParser::TryParse(langStr, loc);

        result = intl::LocaleParser::TryParse(langStr, loc);

      }

    }

    if (result.isOk() && loc.Canonicalize().isOk()) {