diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 16:08:35 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 16:08:35 +0000 |
| commit | dbc09f12db59bc0da056d1b2b6821fe56c6d76f2 (patch) | |
| tree | 0abeb48ec6b3f95f3859c099d9a5e3a6ea243d60 /src/mutex.h | |
| parent | 4328de857d7ed2f12a9c8162788e160dffaf097e (diff) | |
| parent | 13025b119f788a776087cda7dc0b5213e24e7545 (diff) | |
| download | gflags-dbc09f12db59bc0da056d1b2b6821fe56c6d76f2.tar.gz gflags-dbc09f12db59bc0da056d1b2b6821fe56c6d76f2.tar.bz2 gflags-dbc09f12db59bc0da056d1b2b6821fe56c6d76f2.zip | |
Merge remote-tracking branch 'github/cmake-migration'
Diffstat (limited to 'src/mutex.h')
| -rw-r--r-- | src/mutex.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/mutex.h b/src/mutex.h index 7c3c060..3e2f28e 100644 --- a/src/mutex.h +++ b/src/mutex.h @@ -32,11 +32,6 @@ // A simple mutex wrapper, supporting locks and read-write locks. // You should assume the locks are *not* re-entrant. // -// To use: you should define the following macros in your configure.ac: -// ACX_PTHREAD -// AC_RWLOCK -// The latter is defined in ../autoconf. -// // This class is meant to be internal-only and should be wrapped by an // internal namespace. Before you use this module, please give the // name of your internal namespace for this module. Or, if you want @@ -108,13 +103,13 @@ // weird to a Mutex's memory after it is destroyed, but for a // static global variable, that's pretty safe. -#ifndef GOOGLE_MUTEX_H_ -#define GOOGLE_MUTEX_H_ +#ifndef GFLAGS_MUTEX_H_ +#define GFLAGS_MUTEX_H_ -#include "config.h" // to figure out pthreads support +#include "gflags_declare.h" // to figure out pthreads support #if defined(NO_THREADS) - typedef int MutexType; // to keep a lock-count + typedef int MutexType; // to keep a lock-count #elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN // We only need minimal includes @@ -353,4 +348,4 @@ using namespace MUTEX_NAMESPACE; #undef MUTEX_NAMESPACE -#endif /* #define GOOGLE_MUTEX_H__ */ +#endif /* #define GFLAGS_MUTEX_H__ */ |