aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <g@ethdev.com>2015-01-15 23:36:40 +0800
committerGav Wood <g@ethdev.com>2015-01-15 23:36:40 +0800
commitc6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb (patch)
tree4027ad6c4356ecea4f9460355b35205f3bde8871
parent93e3bca42042a7133b0627b4cf26600f73c70625 (diff)
parent95fc27cba9a2241fbc438f3982f3642fe5a4bfe5 (diff)
downloaddexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar.gz
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar.bz2
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar.lz
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar.xz
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.tar.zst
dexon-solidity-c6a47a4dc2e6b5a9fb03e8282b6b3ef108fdcbcb.zip
Merge pull request #811 from LefterisJP/az_mainWinStyle
Style fixes in MainWin of AZ.
-rw-r--r--Token.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Token.h b/Token.h
index 2d4441d0..e5c61c7e 100644
--- a/Token.h
+++ b/Token.h
@@ -47,6 +47,10 @@
#include <libsolidity/Utils.h>
#include <libsolidity/Exceptions.h>
+#if defined(DELETE)
+#error The macro "DELETE" from windows.h conflicts with this file. Please change the order of includes.
+#endif
+
namespace dev
{
namespace solidity