diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /intl/locale | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'intl/locale')
| -rw-r--r-- | intl/locale/mac/OSPreferences_mac.cpp | 3 | ||||
| -rw-r--r-- | intl/locale/moz.build | 2 | ||||
| -rw-r--r-- | intl/locale/mozILocaleService.idl | 8 | ||||
| -rw-r--r-- | intl/locale/mozIOSPreferences.idl | 8 |
4 files changed, 3 insertions, 18 deletions
diff --git a/intl/locale/mac/OSPreferences_mac.cpp b/intl/locale/mac/OSPreferences_mac.cpp index f8cd910b40..ddd0a41e03 100644 --- a/intl/locale/mac/OSPreferences_mac.cpp +++ b/intl/locale/mac/OSPreferences_mac.cpp @@ -6,7 +6,8 @@ #include "OSPreferences.h" #include "mozilla/intl/LocaleService.h" -#include <Carbon/Carbon.h> +#include <CoreFoundation/CoreFoundation.h> +#include <CoreText/CoreText.h> using namespace mozilla::intl; diff --git a/intl/locale/moz.build b/intl/locale/moz.build index 8099d1a695..10e7c5cfb1 100644 --- a/intl/locale/moz.build +++ b/intl/locale/moz.build @@ -14,7 +14,7 @@ toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"] if toolkit == "windows": DIRS += ["windows"] -elif toolkit == "cocoa": +elif toolkit in ("cocoa", "uikit"): DIRS += ["mac"] elif toolkit == "gtk": DIRS += ["gtk"] diff --git a/intl/locale/mozILocaleService.idl b/intl/locale/mozILocaleService.idl index 71227a64d3..0cf027caea 100644 --- a/intl/locale/mozILocaleService.idl +++ b/intl/locale/mozILocaleService.idl @@ -5,14 +5,6 @@ #include "nsISupports.idl" -%{C++ -// Define Contractid and CID -#define MOZ_LOCALESERVICE_CID \ - { 0x92735ff4, 0x6384, 0x4ad6, { 0x85, 0x08, 0x75, 0x70, 0x10, 0xe1, 0x49, 0xee } } - -#define MOZ_LOCALESERVICE_CONTRACTID "@mozilla.org/intl/localeservice;1" -%} - [scriptable, uuid(C27F8983-B48B-4D1A-92D7-FEB8106F212D)] interface mozILocaleService : nsISupports { diff --git a/intl/locale/mozIOSPreferences.idl b/intl/locale/mozIOSPreferences.idl index f3e1c12440..1664aabfbe 100644 --- a/intl/locale/mozIOSPreferences.idl +++ b/intl/locale/mozIOSPreferences.idl @@ -5,14 +5,6 @@ #include "nsISupports.idl" -%{C++ -// Define Contractid and CID -#define MOZ_OSPREFERENCES_CID \ - { 0x65944815, 0xe9ae, 0x48bd, { 0xa2, 0xbf, 0xf1, 0x10, 0x87, 0x20, 0x95, 0x0c } } - -#define MOZ_OSPREFERENCES_CONTRACTID "@mozilla.org/intl/ospreferences;1" -%} - [scriptable, uuid(65944815-e9ae-48bd-a2bf-f1108720950c)] interface mozIOSPreferences : nsISupports { |