Bug 1249275: Fix mac compilation when sandbox is disabled. r=gerald
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 19 Feb 2016 01:34:38 +1100
changeset 322268 4cba1f83f797b5cf6013a47683eff3f66e7d139b
parent 322267 9f716491fee02e0a3abe6ebb83f0be093fecb94a
child 322269 0a48f8ebe02fc7397a2dca7f80ae7d9d58089c49
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1249275
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1249275: Fix mac compilation when sandbox is disabled. r=gerald MozReview-Commit-ID: D1Xc0Ujnm74
dom/media/gmp/GMPChild.cpp
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -122,17 +122,17 @@ GetPluginFile(const nsAString& aPluginPa
   nsAutoString binaryName =                            baseName + NS_LITERAL_STRING(".dll");
 #else
 #error not defined
 #endif
   aLibFile->AppendRelativePath(binaryName);
   return true;
 }
 
-#if !defined(XP_MACOSX)
+#if !defined(XP_MACOSX) || !defined(MOZ_GMP_SANDBOX)
 static bool
 GetPluginFile(const nsAString& aPluginPath,
               nsCOMPtr<nsIFile>& aLibFile)
 {
   nsCOMPtr<nsIFile> unusedlibDir;
   return GetPluginFile(aPluginPath, unusedlibDir, aLibFile);
 }
 #endif