diff options
| author | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
| commit | 6aee5fcbe7473a3cbac12b7e8482a7b98bef8be3 (patch) | |
| tree | 91ec91d5c19eba9c2fe0e84b1c9dc7047a3de80e /dep/src/zthread/FastRecursiveLock.h | |
| parent | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (diff) | |
| parent | f385747164c3fb278c92ef46fbd6c3da6590bbf0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'dep/src/zthread/FastRecursiveLock.h')
| -rw-r--r-- | dep/src/zthread/FastRecursiveLock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/src/zthread/FastRecursiveLock.h b/dep/src/zthread/FastRecursiveLock.h index 0a36f62d5f8..96b66ebe675 100644 --- a/dep/src/zthread/FastRecursiveLock.h +++ b/dep/src/zthread/FastRecursiveLock.h @@ -33,11 +33,11 @@ // Select the correct FastRecusriveLock implementation based on // what the compilation environment has defined -#if defined(ZTHREAD_DUAL_LOCKS) +#if defined(ZTHREAD_DUAL_LOCKS) # include "vanilla/DualMutexRecursiveLock.h" #else -# ifndef ZT_VANILLA +# ifndef ZT_VANILLA # if defined(ZT_POSIX) @@ -50,7 +50,7 @@ # include "linux/FastRecursiveLock.h" # elif defined(HAVE_MUTEXATTR_SETTYPE) # include "solaris/FastRecursiveLock.h" -# elif defined(ZTHREAD_CONDITION_LOCKS) +# elif defined(ZTHREAD_CONDITION_LOCKS) # include "posix/ConditionRecursiveLock.h" # endif |