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

diff --git a/src/base/mutex.h b/src/base/mutex.h
index 7a48c41..7ba88cb 100644 (file)
--- 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)