cerc-io/solidity
10
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

Updates for mingw support. #undef conflicting defines on windows.

Browse Source
This commit is contained in:
jhuntley 2015-01-16 16:56:13 -05:00
parent d82b8c2738
commit f046be3cc1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Token.h
View File

@ -65,6 +65,12 @@ namespace solidity
// an argument (at any position) for a TOKEN_LIST call. It does // an argument (at any position) for a TOKEN_LIST call. It does
// nothing with tokens belonging to the respective category. // 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 IGNORE_TOKEN(name, string, precedence)
#define TOKEN_LIST(T, K) \ #define TOKEN_LIST(T, K) \

3
Types.h
View File

@ -67,6 +67,9 @@ private:
MemberMap m_memberTypes; MemberMap m_memberTypes;
}; };
#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.