From 183d66a5c2620034854a79e2e2e3b6f78f7e59f9 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 28 Sep 2018 14:20:47 +0200 Subject: [PATCH] pipeline: fix compiler warning due to PAUSE symbol redefined --- panda/src/pipeline/conditionVarSpinlockImpl.cxx | 2 ++ panda/src/pipeline/reMutexSpinlockImpl.cxx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/panda/src/pipeline/conditionVarSpinlockImpl.cxx b/panda/src/pipeline/conditionVarSpinlockImpl.cxx index d35d8cd1f7..2b4be0d4e7 100644 --- a/panda/src/pipeline/conditionVarSpinlockImpl.cxx +++ b/panda/src/pipeline/conditionVarSpinlockImpl.cxx @@ -58,4 +58,6 @@ wait(double timeout) { _mutex.lock(); } +#undef PAUSE + #endif // MUTEX_SPINLOCK diff --git a/panda/src/pipeline/reMutexSpinlockImpl.cxx b/panda/src/pipeline/reMutexSpinlockImpl.cxx index 0de12f986f..de0b2c0355 100644 --- a/panda/src/pipeline/reMutexSpinlockImpl.cxx +++ b/panda/src/pipeline/reMutexSpinlockImpl.cxx @@ -54,4 +54,6 @@ try_lock() { } } +#undef PAUSE + #endif // MUTEX_SPINLOCK