fix merged build

This commit is contained in:
Peter Kümmel 2016-01-06 12:55:12 +01:00
parent c098ee0c72
commit 936ec66124

View File

@ -30,6 +30,10 @@
#include <string>
#include <vector>
#ifdef ERROR
#undef ERROR
#endif
namespace lyx {
namespace support { class FileName; }