diff options
| author | chriseth <chris@ethereum.org> | 2017-07-12 21:07:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 21:07:20 +0800 |
| commit | b7a59652f1f115490bc2cb175c3d684267067958 (patch) | |
| tree | 640a00855d16654f4d2b8bd7ae931e09ad1135db /libsolidity | |
| parent | 106acd9cbb827a39cd9bfd67866dafe0eeeb31de (diff) | |
| parent | b615b01449984b21d7615d6daf70455a56e7bdbc (diff) | |
| download | dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar.gz dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar.bz2 dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar.lz dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar.xz dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.tar.zst dexon-solidity-b7a59652f1f115490bc2cb175c3d684267067958.zip | |
Merge pull request #2501 from ethereum/undef-macros
Move UndefMacros from libdevcore to libsolidity/parsing
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/ast/Types.h | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/UndefMacros.h | 46 |
3 files changed, 47 insertions, 2 deletions
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 87d88a79..66eb039f 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -28,7 +28,6 @@ #include <libdevcore/Common.h> #include <libdevcore/CommonIO.h> -#include <libdevcore/UndefMacros.h> #include <boost/noncopyable.hpp> #include <boost/rational.hpp> diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 39c0eff9..d412b3f0 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -44,7 +44,7 @@ #include <libdevcore/Common.h> #include <libsolidity/interface/Exceptions.h> -#include <libdevcore/UndefMacros.h> +#include <libsolidity/parsing/UndefMacros.h> namespace dev { diff --git a/libsolidity/parsing/UndefMacros.h b/libsolidity/parsing/UndefMacros.h new file mode 100644 index 00000000..d96e242e --- /dev/null +++ b/libsolidity/parsing/UndefMacros.h @@ -0,0 +1,46 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see <http://www.gnu.org/licenses/>. +*/ +/** @file UndefMacros.h + * @author Lefteris <lefteris@ethdev.com> + * @date 2015 + * + * This header should be used to #undef some really evil macros defined by + * windows.h which result in conflict with our Token.h + */ +#pragma once + +#if defined(_MSC_VER) || defined(__MINGW32__) + +#undef DELETE +#undef IN +#undef VOID +#undef THIS +#undef CONST + +// Conflicting define on MinGW in windows.h +// windows.h(19): #define interface struct +#ifdef interface +#undef interface +#endif + +#elif defined(DELETE) || defined(IN) || defined(VOID) || defined(THIS) || defined(CONST) || defined(interface) + +#error "The preceding macros in this header file are reserved for V8's "\ +"TOKEN_LIST. Please add a platform specific define above to undefine "\ +"overlapping macros." + +#endif |