wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1167494 - Build error with --disable-sandbox on OS X. r=jld

Browse Source
This commit is contained in:
Steven Michaud 2015-05-29 11:07:06 -05:00
parent 7923221508
commit a1ac81e701
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/media/gmp/GMPChild.cpp
View File

@ -67,7 +67,7 @@ GMPChild::~GMPChild()
static bool
GetFileBase(const std::string& aPluginPath,
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
nsCOMPtr<nsIFile>& aLibDirectory,
#endif
nsCOMPtr<nsIFile>& aFileBase,
@ -81,7 +81,7 @@ GetFileBase(const std::string& aPluginPath,
return false;
}
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
if (NS_FAILED(aFileBase->Clone(getter_AddRefs(aLibDirectory)))) {
return false;
}
@ -107,13 +107,13 @@ GetFileBase(const std::string& aPluginPath,
static bool
GetPluginFile(const std::string& aPluginPath,
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
nsCOMPtr<nsIFile>& aLibDirectory,
#endif
nsCOMPtr<nsIFile>& aLibFile)
{
nsAutoString baseName;
#ifdef XP_MACOSX
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
GetFileBase(aPluginPath, aLibDirectory, aLibFile, baseName);
#else
GetFileBase(aPluginPath, aLibFile, baseName);
@ -592,7 +592,7 @@ GetPluginVoucherFile(const std::string& aPluginPath,
nsCOMPtr<nsIFile>& aOutVoucherFile)
{
nsAutoString baseName;
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
nsCOMPtr<nsIFile> libDir;
GetFileBase(aPluginPath, aOutVoucherFile, libDir, baseName);
#else

4
dom/media/gmp/GMPLoader.cpp
View File

@ -80,7 +80,7 @@ public:
virtual void Shutdown() override;
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
virtual void SetSandboxInfo(MacSandboxInfo* aSandboxInfo) override;
#endif
@ -275,7 +275,7 @@ GMPLoaderImpl::Shutdown()
}
}
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
void
GMPLoaderImpl::SetSandboxInfo(MacSandboxInfo* aSandboxInfo)
{

6
dom/media/gmp/GMPLoader.h
View File

@ -10,7 +10,7 @@
#include <stdint.h>
#include "gmp-entrypoints.h"
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
#include "mozilla/Sandbox.h"
#endif
@ -21,7 +21,7 @@ class SandboxStarter {
public:
virtual ~SandboxStarter() {}
virtual bool Start(const char* aLibPath) = 0;
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
// On OS X we need to set Mac-specific sandbox info just before we start the
// sandbox, which we don't yet know when the GMPLoader and SandboxStarter
// objects are created.
@ -65,7 +65,7 @@ public:
// plugin library.
virtual void Shutdown() = 0;
#if defined(XP_MACOSX)
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
// On OS X we need to set Mac-specific sandbox info just before we start the
// sandbox, which we don't yet know when the GMPLoader and SandboxStarter
// objects are created.