From 055f45f11b89f5f0b10302c211bab3534f48cad2 Mon Sep 17 00:00:00 2001
From: jhuntley <jhuntley@houghtonassociates.com>
Date: Wed, 21 Jan 2015 12:21:14 -0500
Subject: [PATCH] Update to resolve "#error :  The macro "DELETE" from
 windows.h conflicts with this file." on windows vs build.

---
 Token.h |  2 +-
 Types.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Token.h b/Token.h
index be6a37e5d..24b06d16c 100644
--- a/Token.h
+++ b/Token.h
@@ -53,7 +53,7 @@
 
 // Updates for mingw support. #undef conflicting defines which have been
 // repurposed for TOKEN_LIST on windows.
-#if defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #undef IN
 #undef CONST
 #endif
diff --git a/Types.h b/Types.h
index 77fc66e9f..511e5f64f 100644
--- a/Types.h
+++ b/Types.h
@@ -31,6 +31,12 @@
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/Token.h>
 
+// Updates for mingw support. #undef conflicting defines which have been
+// repurposed for TOKEN_LIST on windows.
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#undef VOID
+#endif
+
 namespace dev
 {
 namespace solidity
@@ -67,12 +73,6 @@ private:
 	MemberMap m_memberTypes;
 };
 
-// Updates for mingw support. #undef conflicting defines which have been
-// repurposed for TOKEN_LIST on windows.
-#if defined(__MINGW32__)
-#undef VOID
-#endif
-
 /**
  * Abstract base class that forms the root of the type hierarchy.
  */