diff options
author | jhuntley <jhuntley@houghtonassociates.com> | 2015-01-22 01:21:14 +0800 |
---|---|---|
committer | jhuntley <jhuntley@houghtonassociates.com> | 2015-03-05 00:17:46 +0800 |
commit | 055f45f11b89f5f0b10302c211bab3534f48cad2 (patch) | |
tree | 903d54ffc323adba718d403ff168be4dde8c5131 /Types.h | |
parent | d2a5153722d23815802e015d3a175106df20663e (diff) | |
download | dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.gz dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.zst dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.zip |
Update to resolve "#error : The macro "DELETE" from windows.h conflicts with this file." on windows vs build.
Diffstat (limited to 'Types.h')
-rw-r--r-- | Types.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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. */ |