diff options
author | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
commit | 76e7f978c157f9921593ea0e43f642cb9de4703d (patch) | |
tree | ccc62865f26cb84cabbe9b65de23c4e1342aa142 /indra/llcommon/llmutex.h | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
parent | cf143bd4610dc279f1aa790e0b37fbad5c86f654 (diff) |
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
Diffstat (limited to 'indra/llcommon/llmutex.h')
-rw-r--r-- | indra/llcommon/llmutex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llmutex.h b/indra/llcommon/llmutex.h index 3659a319a2..ea535cee86 100644 --- a/indra/llcommon/llmutex.h +++ b/indra/llcommon/llmutex.h @@ -33,6 +33,10 @@ #define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO) +#if MUTEX_DEBUG +#include <map> +#endif + struct apr_thread_mutex_t; struct apr_pool_t; struct apr_thread_cond_t; |