diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
| commit | cd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch) | |
| tree | 2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/llmessage/llpumpio.h | |
| parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
| parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) | |
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/llmessage/llpumpio.h')
| -rw-r--r-- | indra/llmessage/llpumpio.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/llmessage/llpumpio.h b/indra/llmessage/llpumpio.h index d2c5d37571..b9eabee710 100644 --- a/indra/llmessage/llpumpio.h +++ b/indra/llmessage/llpumpio.h @@ -40,9 +40,6 @@ #include "lliopipe.h" #include "llrun.h" -// Define this to enable use with the APR thread library. -//#define LL_THREADS_APR 1 - // some simple constants to help with timeouts extern const F32 DEFAULT_CHAIN_EXPIRY_SECS; extern const F32 SHORT_CHAIN_EXPIRY_SECS; @@ -393,14 +390,6 @@ protected: apr_pool_t* mCurrentPool; S32 mCurrentPoolReallocCount; -#if LL_THREADS_APR - apr_thread_mutex_t* mChainsMutex; - apr_thread_mutex_t* mCallbackMutex; -#else - int* mChainsMutex; - int* mCallbackMutex; -#endif - protected: void initialize(apr_pool_t* pool); void cleanup(); |