summaryrefslogtreecommitdiffstats
path: root/src/lexer.h
diff options
context:
space:
mode:
authorScott Graham <sgraham@gmail.com>2012-01-04 22:18:17 (GMT)
committerEvan Martin <martine@danga.com>2012-01-04 22:18:39 (GMT)
commitf4df3f731a732a11861145b310cbd252c52e8cfe (patch)
treea05863addb5f30c7f78104c4f3c78339b81df30b /src/lexer.h
parent4a09acf125285fd773f2df0f00b2783aaa9f2f6f (diff)
downloadNinja-f4df3f731a732a11861145b310cbd252c52e8cfe.zip
Ninja-f4df3f731a732a11861145b310cbd252c52e8cfe.tar.gz
Ninja-f4df3f731a732a11861145b310cbd252c52e8cfe.tar.bz2
windows: more build fixes
Diffstat (limited to 'src/lexer.h')
-rw-r--r--src/lexer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lexer.h b/src/lexer.h
index 40e602a..c872b98 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -14,6 +14,11 @@
#include "string_piece.h"
+// Windows may #define ERROR.
+#ifdef ERROR
+#undef ERROR
+#endif
+
struct EvalString;
struct Lexer {