diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 16:46:56 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 16:46:56 +0000 |
| commit | 41181669d15b8630e63a449388401d16fc1c2741 (patch) | |
| tree | 41a592c7069acf87229b9f36bdb9e94f00b6cc48 /src/mutex.h | |
| parent | dbc09f12db59bc0da056d1b2b6821fe56c6d76f2 (diff) | |
| download | gflags-41181669d15b8630e63a449388401d16fc1c2741.tar.gz gflags-41181669d15b8630e63a449388401d16fc1c2741.tar.bz2 gflags-41181669d15b8630e63a449388401d16fc1c2741.zip | |
Use OS_WINDOWS #define instead of _WIN32 and WINDOWS.
The OS_WINDOWS #define has previously been used in gflags.cc before the CMake migration.
Diffstat (limited to 'src/mutex.h')
| -rw-r--r-- | src/mutex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mutex.h b/src/mutex.h index 3e2f28e..0bdd9d5 100644 --- a/src/mutex.h +++ b/src/mutex.h @@ -110,7 +110,7 @@ #if defined(NO_THREADS) typedef int MutexType; // to keep a lock-count -#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) +#elif defined(OS_WINDOWS) # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN // We only need minimal includes # endif @@ -227,7 +227,7 @@ bool Mutex::TryLock() { if (mutex_) return false; Lock(); return true; } void Mutex::ReaderLock() { assert(++mutex_ > 0); } void Mutex::ReaderUnlock() { assert(mutex_-- > 0); } -#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) +#elif defined(OS_WINDOWS) Mutex::Mutex() : destroy_(true) { InitializeCriticalSection(&mutex_); |