summaryrefslogtreecommitdiff
path: root/memory/volatile
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2021-07-15 23:13:31 +0000
committerMoonchild <moonchild@palemoon.org>2021-07-15 23:13:31 +0000
commitfeafc2f129df921f9e2954f0a21b1060588e4a0f (patch)
tree248d2f8df51e96c0d518ae5c782ad801ec53702f /memory/volatile
parent84825468041d590ff8c660c42cf93b0d2243ad52 (diff)
parentc198ef11b9d2697501b3ea4cbcab98e4dad48a9d (diff)
downloaduxp-feafc2f129df921f9e2954f0a21b1060588e4a0f.tar.gz
Merge branch 'master' into releaseRELBASE_20210719RC_20210715
Diffstat (limited to 'memory/volatile')
-rw-r--r--memory/volatile/VolatileBuffer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/memory/volatile/VolatileBuffer.h b/memory/volatile/VolatileBuffer.h
index b6bcdfcb74..19aeb9df2b 100644
--- a/memory/volatile/VolatileBuffer.h
+++ b/memory/volatile/VolatileBuffer.h
@@ -76,9 +76,7 @@ private:
void* mBuf;
size_t mSize;
int mLockCount;
-#ifdef XP_DARWIN
- bool mHeap;
-#elif defined(XP_WIN)
+#if defined(XP_WIN)
bool mHeap;
bool mFirstLock;
#endif