summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-16 17:35:25 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-16 17:35:25 -0400
commit943c23ba7391cfd47921d3e67f4131a83fe5f907 (patch)
treedc0171177986c6dee1caa02e8afe5c6341bd9649
parentd6b8b49f7f74bf8c503fac7db8e0f47a87f5a9a0 (diff)
parente550533e23323ebf8e380f7d88387fc04740bc2e (diff)
merge
-rw-r--r--indra/llcommon/llthread.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index b631b96252..3f7f918f57 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -151,15 +151,15 @@ protected:
//============================================================================
-#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO)
+//#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO)
-#ifdef MUTEX_DEBUG
+//#ifdef MUTEX_DEBUG
// We really shouldn't be using recursive locks. Make sure of that in debug mode.
#define MUTEX_FLAG APR_THREAD_MUTEX_UNNESTED
-#else
+//#else
// Use the fastest platform-optimal lock behavior (can be recursive or non-recursive).
-#define MUTEX_FLAG APR_THREAD_MUTEX_DEFAULT
-#endif
+//#define MUTEX_FLAG APR_THREAD_MUTEX_DEFAULT
+//#endif
class LL_COMMON_API LLMutexBase
{