Landing the rest of the mach-o OSX changes.

Bug #75653 r=cls sr=waterson

xpcom/io/nsAppFileLocationProvider.cpp

@@ -30,14 +30,13 @@
 #include "nsString.h"
 #include "nsXPIDLString.h"
 
-#if defined(XP_MAC)
+#if defined(XP_MAC) /* || defined(XP_MACOSX) REMIND HACKING FOR MACOS X!!! */
 #include <Folders.h>
 #include <Script.h>
 #include <Processes.h>
 #include <Gestalt.h>
 #include "nsILocalFileMac.h"
-#endif
-#if defined(XP_OS2)
+#elif defined(XP_OS2)
 #define INCL_DOSPROCESS
 #define INCL_DOSMODULEMGR
 #include <os2.h>
@@ -59,7 +58,7 @@
 // WARNING: These hard coded names need to go away. They need to
 // come from localizable resources
 
-#ifdef XP_MAC
+#if defined(XP_MAC) /* || defined(XP_MACOSX) REMIND HACKING FOR MACOS X!!! */
 #define APP_REGISTRY_NAME "Application Registry"
 #elif defined(XP_WIN) || defined(XP_OS2)
 #define APP_REGISTRY_NAME "registry.dat"
@@ -250,7 +249,7 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi
     PRBool exists;
     nsCOMPtr<nsILocalFile> localDir;
 
-#if defined(XP_MAC)
+#if defined(XP_MAC) /* || defined(XP_MACOSX) REMIND HACKING FOR MACOS X!!! */
     nsCOMPtr<nsIProperties> directoryService = 
              do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
@@ -329,7 +328,7 @@ NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aL
     rv = GetProductDirectory(getter_AddRefs(localDir));
     if (NS_FAILED(rv)) return rv;
 
-#if defined(XP_MAC) || defined(XP_OS2) || defined(XP_PC)
+#if defined(XP_MAC) || defined(XP_MACOSX) || defined(XP_OS2) || defined(XP_PC)
     // These 3 platforms share this part of the path - do them as one
     rv = localDir->AppendRelativePath("Profiles");
     if (NS_FAILED(rv)) return rv;