aboutsummaryrefslogtreecommitdiffstats
path: root/Token.h
diff options
context:
space:
mode:
authorjhuntley <jhuntley@houghtonassociates.com>2015-01-22 01:21:14 +0800
committerjhuntley <jhuntley@houghtonassociates.com>2015-03-05 00:17:46 +0800
commit055f45f11b89f5f0b10302c211bab3534f48cad2 (patch)
tree903d54ffc323adba718d403ff168be4dde8c5131 /Token.h
parentd2a5153722d23815802e015d3a175106df20663e (diff)
downloaddexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar
dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.gz
dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.bz2
dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.lz
dexon-solidity-055f45f11b89f5f0b10302c211bab3534f48cad2.tar.xz
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 'Token.h')
-rw-r--r--Token.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Token.h b/Token.h
index be6a37e5..24b06d16 100644
--- a/Token.h
+++ b/Token.h
@@ -53,7 +53,7 @@
// Updates for mingw support. #undef conflicting defines which have been
// repurposed for TOKEN_LIST on windows.
-#if defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
#undef IN
#undef CONST
#endif