Bug 1100963 - Fixed Windows compilation with disabled sandbox. r=cpearce
authorJacek Caban <jacek@codeweavers.com>
Wed, 19 Nov 2014 11:07:52 +0100
changeset 240799 33b8e5e8261e25725af7276dfd6756010b8aac5d
parent 240798 fb8cff8e93509eb2d8cd1346a78b592cf1887a91
child 240800 2582b6cec7b0044541a66a2aef397440e34bd67e
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1100963
milestone36.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 1100963 - Fixed Windows compilation with disabled sandbox. r=cpearce
dom/media/gmp/GMPLoader.cpp
--- a/dom/media/gmp/GMPLoader.cpp
+++ b/dom/media/gmp/GMPLoader.cpp
@@ -67,17 +67,17 @@ private:
   GMPGetAPIFunc mGetAPIFunc;
   SandboxStarter* mSandboxStarter;
 };
 
 GMPLoader* CreateGMPLoader(SandboxStarter* aStarter) {
   return static_cast<GMPLoader*>(new GMPLoaderImpl(aStarter));
 }
 
-#if defined(XP_WIN)
+#if defined(XP_WIN) && defined(HASH_NODE_ID_WITH_DEVICE_ID)
 MOZ_NEVER_INLINE
 static bool
 GetStackAfterCurrentFrame(uint8_t** aOutTop, uint8_t** aOutBottom)
 {
   // "Top" of the free space on the stack is directly after the memory
   // holding our return address.
   uint8_t* top = (uint8_t*)_AddressOfReturnAddress();