diff options
| author | <shinichiro.hamaji@gmail.com> | 2009-07-27 08:13:30 +0000 |
|---|---|---|
| committer | <shinichiro.hamaji@gmail.com> | 2009-07-27 08:13:30 +0000 |
| commit | 2c28a49394735342cb4695cb5bd531676fdb129b (patch) | |
| tree | 4c75f3ac55012d3b8516f5c5c7ff1479d97977bd | |
| parent | c24b607748c25a272abe0e5dfe4956ef4e53e4d9 (diff) | |
| download | glog-2c28a49394735342cb4695cb5bd531676fdb129b.tar.gz glog-2c28a49394735342cb4695cb5bd531676fdb129b.tar.bz2 glog-2c28a49394735342cb4695cb5bd531676fdb129b.zip | |
Regression: Add NOGDI and NOMINMAX macros before including windows.h.
git-svn-id: https://google-glog.googlecode.com/svn/trunk@61 eb4d4688-79bd-11dd-afb4-1d65580434c0
| -rw-r--r-- | src/base/mutex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/base/mutex.h b/src/base/mutex.h index 7a48c41..7ba88cb 100644 --- a/src/base/mutex.h +++ b/src/base/mutex.h @@ -116,6 +116,10 @@ # define _WIN32_WINNT 0x0400 # endif # endif +// To avoid macro definition of ERROR. +# define NOGDI +// To avoid macro definition of min/max. +# define NOMINMAX # include <windows.h> typedef CRITICAL_SECTION MutexType; #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK) |