cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jhuntley 2015-01-21 12:21:14 -05:00
parent d2a5153722
commit 055f45f11b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Token.h
View File

@ -53,7 +53,7 @@
// Updates for mingw support. #undef conflicting defines which have been // Updates for mingw support. #undef conflicting defines which have been
// repurposed for TOKEN_LIST on windows. // repurposed for TOKEN_LIST on windows.
#if defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#undef IN #undef IN
#undef CONST #undef CONST
#endif #endif

12
Types.h
View File

@ -31,6 +31,12 @@
#include <libsolidity/ASTForward.h> #include <libsolidity/ASTForward.h>
#include <libsolidity/Token.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 dev
{ {
namespace solidity namespace solidity
@ -67,12 +73,6 @@ private:
MemberMap m_memberTypes; 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. * Abstract base class that forms the root of the type hierarchy.
*/ */