From 3daf711085889bad1bd68651bc4e8790412ae105 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@dbsoft.org>
Date: Tue, 26 Apr 2022 10:13:11 -0500
Subject: =?UTF-8?q?Issue=20#1829=20-=20Revert=20=E2=80=9CIssue=20#1751=20-?=
 =?UTF-8?q?-=20Remove=20XP=5FMACOSX=20conditionals=20from=20the=20rest=20o?=
 =?UTF-8?q?f=20the=20tree.=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 chrome/nsChromeRegistry.cpp       | 2 ++
 chrome/nsChromeRegistryChrome.cpp | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'chrome')

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"
-- 
cgit v1.2.3