corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 691133 - xpcom: fails to build darwin/x11. r=smichaud

Browse Source
This commit is contained in:
Hanspeter Niederstrasser
2011-10-14 10:43:35 -05:00
parent d025280141
commit 85fcc021e2
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xpcom/io/nsAppFileLocationProvider.cpp
View File

@@ -593,7 +593,7 @@ nsAppFileLocationProvider::GetFiles(const char *prop, nsISimpleEnumerator **_ret
return rv; return rv;
} }
#if defined(XP_MACOSX) #if defined(MOZ_WIDGET_COCOA)
bool bool
nsAppFileLocationProvider::IsOSXLeopard() nsAppFileLocationProvider::IsOSXLeopard()
{ {

2
xpcom/io/nsAppFileLocationProvider.h
View File

@@ -72,7 +72,7 @@ protected:
NS_METHOD GetDefaultUserProfileRoot(nsILocalFile **aLocalFile, NS_METHOD GetDefaultUserProfileRoot(nsILocalFile **aLocalFile,
bool aLocal = false); bool aLocal = false);
#if defined(XP_MACOSX) #if defined(MOZ_WIDGET_COCOA)
static bool IsOSXLeopard(); static bool IsOSXLeopard();
#endif #endif

14
xpcom/io/nsLocalFileUnix.cpp
View File

@@ -95,7 +95,7 @@
#include "nsIGnomeVFSService.h" #include "nsIGnomeVFSService.h"
#endif #endif
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include "CocoaFileUtils.h" #include "CocoaFileUtils.h"
#include "prmem.h" #include "prmem.h"
@@ -273,7 +273,7 @@ nsLocalFile::nsLocalFile(const nsLocalFile& other)
{ {
} }
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
NS_IMPL_THREADSAFE_ISUPPORTS4(nsLocalFile, NS_IMPL_THREADSAFE_ISUPPORTS4(nsLocalFile,
nsILocalFileMac, nsILocalFileMac,
nsILocalFile, nsILocalFile,
@@ -1445,7 +1445,7 @@ nsLocalFile::IsExecutable(bool *_retval)
} }
// On OS X, then query Launch Services. // On OS X, then query Launch Services.
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
// Certain Mac applications, such as Classic applications, which // Certain Mac applications, such as Classic applications, which
// run under Rosetta, might not have the +x mode bit but are still // run under Rosetta, might not have the +x mode bit but are still
// considered to be executable by Launch Services (bug 646748). // considered to be executable by Launch Services (bug 646748).
@@ -1740,7 +1740,7 @@ nsLocalFile::GetPersistentDescriptor(nsACString &aPersistentDescriptor)
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::SetPersistentDescriptor(const nsACString &aPersistentDescriptor) nsLocalFile::SetPersistentDescriptor(const nsACString &aPersistentDescriptor)
{ {
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
if (aPersistentDescriptor.IsEmpty()) if (aPersistentDescriptor.IsEmpty())
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
@@ -1824,7 +1824,7 @@ nsLocalFile::Reveal()
else else
return gnomevfs->ShowURIForInput(dirPath); return gnomevfs->ShowURIForInput(dirPath);
} }
#elif defined(XP_MACOSX) #elif defined(MOZ_WIDGET_COCOA)
CFURLRef url; CFURLRef url;
if (NS_SUCCEEDED(GetCFURL(&url))) { if (NS_SUCCEEDED(GetCFURL(&url))) {
nsresult rv = CocoaFileUtils::RevealFileInFinder(url); nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
@@ -1893,7 +1893,7 @@ nsLocalFile::Launch()
fileUri.Append(mPath); fileUri.Append(mPath);
mozilla::AndroidBridge* bridge = mozilla::AndroidBridge::Bridge(); mozilla::AndroidBridge* bridge = mozilla::AndroidBridge::Bridge();
return bridge->OpenUriExternal(fileUri, type) ? NS_OK : NS_ERROR_FAILURE; return bridge->OpenUriExternal(fileUri, type) ? NS_OK : NS_ERROR_FAILURE;
#elif defined(XP_MACOSX) #elif defined(MOZ_WIDGET_COCOA)
CFURLRef url; CFURLRef url;
if (NS_SUCCEEDED(GetCFURL(&url))) { if (NS_SUCCEEDED(GetCFURL(&url))) {
nsresult rv = CocoaFileUtils::OpenURL(url); nsresult rv = CocoaFileUtils::OpenURL(url);
@@ -2056,7 +2056,7 @@ nsLocalFile::GlobalShutdown()
// nsILocalFileMac // nsILocalFileMac
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
static nsresult MacErrorMapper(OSErr inErr) static nsresult MacErrorMapper(OSErr inErr)
{ {

6
xpcom/io/nsLocalFileUnix.h
View File

@@ -53,7 +53,7 @@
#include "nsReadableUtils.h" #include "nsReadableUtils.h"
#include "nsIHashable.h" #include "nsIHashable.h"
#include "nsIClassInfoImpl.h" #include "nsIClassInfoImpl.h"
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
#include "nsILocalFileMac.h" #include "nsILocalFileMac.h"
#endif #endif
@@ -109,7 +109,7 @@
class nsLocalFile : class nsLocalFile :
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
public nsILocalFileMac, public nsILocalFileMac,
#else #else
public nsILocalFile, public nsILocalFile,
@@ -126,7 +126,7 @@ public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIFILE NS_DECL_NSIFILE
NS_DECL_NSILOCALFILE NS_DECL_NSILOCALFILE
#ifdef XP_MACOSX #ifdef MOZ_WIDGET_COCOA
NS_DECL_NSILOCALFILEMAC NS_DECL_NSILOCALFILEMAC
#endif #endif
NS_DECL_NSIHASHABLE NS_DECL_NSIHASHABLE