From 5cec8a5c6f975f923a79575203bf43756be3bc34 Mon Sep 17 00:00:00 2001
From: jhuntley <jhuntley@houghtonassociates.com>
Date: Fri, 16 Jan 2015 16:56:13 -0500
Subject: [PATCH] Updates for mingw support. #undef conflicting defines on
 windows.

---
 libsolidity/Token.h | 6 ++++++
 libsolidity/Types.h | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/libsolidity/Token.h b/libsolidity/Token.h
index 5e4a6317f..2c24f7aff 100644
--- a/libsolidity/Token.h
+++ b/libsolidity/Token.h
@@ -65,6 +65,12 @@ namespace solidity
 // an argument (at any position) for a TOKEN_LIST call. It does
 // nothing with tokens belonging to the respective category.
 
+#if defined(__MINGW32__)
+#undef IN
+#undef DELETE
+#undef CONST
+#endif
+
 #define IGNORE_TOKEN(name, string, precedence)
 
 #define TOKEN_LIST(T, K)												\
diff --git a/libsolidity/Types.h b/libsolidity/Types.h
index 8474c6c03..99c083c00 100644
--- a/libsolidity/Types.h
+++ b/libsolidity/Types.h
@@ -67,6 +67,9 @@ private:
 	MemberMap m_memberTypes;
 };
 
+#if defined(__MINGW32__)
+#undef VOID
+#endif
 
 /**
  * Abstract base class that forms the root of the type hierarchy.