diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /chrome | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/nsChromeRegistry.cpp | 2 | ||||
| -rw-r--r-- | chrome/nsChromeRegistryChrome.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp index ef2cb79ab7..74de3b80d5 100644 --- a/chrome/nsChromeRegistry.cpp +++ b/chrome/nsChromeRegistry.cpp @@ -296,6 +296,8 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) if (flags & PLATFORM_PACKAGE) { #if defined(XP_WIN) path.Insert("win/", 0); +#elif defined(XP_MACOSX) + path.Insert("mac/", 0); #else path.Insert("unix/", 0); #endif diff --git a/chrome/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp index c115280fdc..7678183fd3 100644 --- a/chrome/nsChromeRegistryChrome.cpp +++ b/chrome/nsChromeRegistryChrome.cpp @@ -11,6 +11,8 @@ #if defined(XP_WIN) #include <windows.h> +#elif defined(XP_MACOSX) +#include <CoreServices/CoreServices.h> #endif #include "nsArrayEnumerator.h" |