fix merged build

diff --git a/src/TextClass.h b/src/TextClass.h
index 94fe003bd80fa372fb5af73ce7323ae42861ba87..a6ffed902ae0c1aec9f10c2e8433e07e18a70608 100644 (file)
--- 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; }