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

Consolidating macro resolution to one header file as per project owner request. Added inline comments covering reasons for undef of macros. Resolves issues with problem #832:

Browse Source 
Adding UndefWindowsMacros.h to handle V8 CPP conflicts in Windows #832
This commit is contained in:
jhuntley 2015-01-23 13:27:56 -05:00
parent 055f45f11b
commit a4d772315d
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Token.h
View File

@ -46,17 +46,7 @@
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libsolidity/Utils.h> #include <libsolidity/Utils.h>
#include <libsolidity/Exceptions.h> #include <libsolidity/Exceptions.h>
#include <libdevcore/UndefMacros.h>
#if defined(DELETE)
#undef DELETE
#endif
// Updates for mingw support. #undef conflicting defines which have been
// repurposed for TOKEN_LIST on windows.
#if defined(_MSC_VER) || defined(__MINGW32__)
#undef IN
#undef CONST
#endif
namespace dev namespace dev
{ {

7
Types.h
View File

@ -30,12 +30,7 @@
#include <libsolidity/Exceptions.h> #include <libsolidity/Exceptions.h>
#include <libsolidity/ASTForward.h> #include <libsolidity/ASTForward.h>
#include <libsolidity/Token.h> #include <libsolidity/Token.h>
#include <libdevcore/UndefMacros.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
{ {