Update to resolve "#error : The macro "DELETE" from windows.h conflicts with this file." on windows vs build.

libsolidity/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

libsolidity/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.
  */