Constrain windows.h to solve build errors

5e343000 · Harris Hancock · 669469ca · 5e343000 · 5e343000
Commit 5e343000 authored May 18, 2016 by Harris Hancock
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

main.c++ c++/src/kj/main.c++ +2 -0

mutex-test.c++ c++/src/kj/mutex-test.c++ +2 -0

No files found.
--- a/c++/src/kj/main.c++
+++ b/c++/src/kj/main.c++
@@ -30,7 +30,9 @@
 #include <limits.h>

 #if _WIN32
+#define NOMINMAX
 #include <windows.h>
+#undef NOMINMAX
 #else
 #include <sys/uio.h>
 #endif

--- a/c++/src/kj/mutex-test.c++
+++ b/c++/src/kj/mutex-test.c++
@@ -25,7 +25,9 @@
 #include <kj/compat/gtest.h>

 #if _WIN32
+#define NOGDI  // NOGDI is needed to make EXPECT_EQ(123u, *lock) compile for some reason
 #include <windows.h>
+#undef NOGDI
 #else
 #include <pthread.h>
 #include <unistd.h>