From 15d61e42bdd4182e7c4b50bcb3314b006ce578c7 Mon Sep 17 00:00:00 2001
From: kosak <kosak@google.com>
Date: Mon, 24 Mar 2014 22:08:24 +0000
Subject: [PATCH] Implement threading support for gmock on Windows. Replace
 U+2013 with U+002D in comment lines. Pull in gtest 681.

---
 src/gmock-matchers.cc       | 6 +++---
 test/gmock-matchers_test.cc | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gmock-matchers.cc b/src/gmock-matchers.cc
index 9ed29abf..e7424510 100644
--- a/src/gmock-matchers.cc
+++ b/src/gmock-matchers.cc
@@ -191,9 +191,9 @@ GTEST_API_ string FormatMatcherDescription(bool negation,
 // .                                         [ sink ]  .
 //
 // See Also:
-//   [1] Cormen, et al (2001). "Section 26.2: The Ford–Fulkerson method".
-//       "Introduction to Algorithms (Second ed.)", pp. 651–664.
-//   [2] "Ford–Fulkerson algorithm", Wikipedia,
+//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
+//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
+//   [2] "Ford-Fulkerson algorithm", Wikipedia,
 //       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
 class MaxBipartiteMatchState {
  public:
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc
index bd20add2..68a027bf 100644
--- a/test/gmock-matchers_test.cc
+++ b/test/gmock-matchers_test.cc
@@ -33,6 +33,10 @@
 //
 // This file tests some commonly used argument matchers.
 
+// windows.h defines macros which conflict with standard identifiers used in
+// this test.  Defining this symbol prevents windows.h from doing that.
+#define NOMINMAX
+
 #include "gmock/gmock-matchers.h"
 #include "gmock/gmock-more-matchers.h"