mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1167494 - Build error with --disable-sandbox on OS X. r=jld
This commit is contained in:
parent
7923221508
commit
a1ac81e701
@ -67,7 +67,7 @@ GMPChild::~GMPChild()
|
|||||||
|
|
||||||
static bool
|
static bool
|
||||||
GetFileBase(const std::string& aPluginPath,
|
GetFileBase(const std::string& aPluginPath,
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
nsCOMPtr<nsIFile>& aLibDirectory,
|
nsCOMPtr<nsIFile>& aLibDirectory,
|
||||||
#endif
|
#endif
|
||||||
nsCOMPtr<nsIFile>& aFileBase,
|
nsCOMPtr<nsIFile>& aFileBase,
|
||||||
@ -81,7 +81,7 @@ GetFileBase(const std::string& aPluginPath,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
if (NS_FAILED(aFileBase->Clone(getter_AddRefs(aLibDirectory)))) {
|
if (NS_FAILED(aFileBase->Clone(getter_AddRefs(aLibDirectory)))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -107,13 +107,13 @@ GetFileBase(const std::string& aPluginPath,
|
|||||||
|
|
||||||
static bool
|
static bool
|
||||||
GetPluginFile(const std::string& aPluginPath,
|
GetPluginFile(const std::string& aPluginPath,
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
nsCOMPtr<nsIFile>& aLibDirectory,
|
nsCOMPtr<nsIFile>& aLibDirectory,
|
||||||
#endif
|
#endif
|
||||||
nsCOMPtr<nsIFile>& aLibFile)
|
nsCOMPtr<nsIFile>& aLibFile)
|
||||||
{
|
{
|
||||||
nsAutoString baseName;
|
nsAutoString baseName;
|
||||||
#ifdef XP_MACOSX
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
GetFileBase(aPluginPath, aLibDirectory, aLibFile, baseName);
|
GetFileBase(aPluginPath, aLibDirectory, aLibFile, baseName);
|
||||||
#else
|
#else
|
||||||
GetFileBase(aPluginPath, aLibFile, baseName);
|
GetFileBase(aPluginPath, aLibFile, baseName);
|
||||||
@ -592,7 +592,7 @@ GetPluginVoucherFile(const std::string& aPluginPath,
|
|||||||
nsCOMPtr<nsIFile>& aOutVoucherFile)
|
nsCOMPtr<nsIFile>& aOutVoucherFile)
|
||||||
{
|
{
|
||||||
nsAutoString baseName;
|
nsAutoString baseName;
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
nsCOMPtr<nsIFile> libDir;
|
nsCOMPtr<nsIFile> libDir;
|
||||||
GetFileBase(aPluginPath, aOutVoucherFile, libDir, baseName);
|
GetFileBase(aPluginPath, aOutVoucherFile, libDir, baseName);
|
||||||
#else
|
#else
|
||||||
|
@ -80,7 +80,7 @@ public:
|
|||||||
|
|
||||||
virtual void Shutdown() override;
|
virtual void Shutdown() override;
|
||||||
|
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
virtual void SetSandboxInfo(MacSandboxInfo* aSandboxInfo) override;
|
virtual void SetSandboxInfo(MacSandboxInfo* aSandboxInfo) override;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ GMPLoaderImpl::Shutdown()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
void
|
void
|
||||||
GMPLoaderImpl::SetSandboxInfo(MacSandboxInfo* aSandboxInfo)
|
GMPLoaderImpl::SetSandboxInfo(MacSandboxInfo* aSandboxInfo)
|
||||||
{
|
{
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "gmp-entrypoints.h"
|
#include "gmp-entrypoints.h"
|
||||||
|
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
||||||
#include "mozilla/Sandbox.h"
|
#include "mozilla/Sandbox.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ class SandboxStarter {
|
|||||||
public:
|
public:
|
||||||
virtual ~SandboxStarter() {}
|
virtual ~SandboxStarter() {}
|
||||||
virtual bool Start(const char* aLibPath) = 0;
|
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
|
// 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
|
// sandbox, which we don't yet know when the GMPLoader and SandboxStarter
|
||||||
// objects are created.
|
// objects are created.
|
||||||
@ -65,7 +65,7 @@ public:
|
|||||||
// plugin library.
|
// plugin library.
|
||||||
virtual void Shutdown() = 0;
|
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
|
// 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
|
// sandbox, which we don't yet know when the GMPLoader and SandboxStarter
|
||||||
// objects are created.
|
// objects are created.
|
||||||
|
Loading…
Reference in New Issue
Block a user