From: Peter Kümmel <kuemmel@lyx.org>
Date: Wed, 6 Jan 2016 11:55:12 +0000 (+0100)
Subject: fix merged build
X-Git-Tag: 2.2.0beta1~248
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=936ec661247e0997fbedbb9a6bab5ba7e19f2715;p=features.git

fix merged build
---

diff --git a/src/TextClass.h b/src/TextClass.h
index 94fe003bd8..a6ffed902a 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -30,6 +30,10 @@
 #include <string>
 #include <vector>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace lyx {
 
 namespace support { class FileName; }