mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-01 08:00:20 +00:00
fix merged build
This commit is contained in:
parent
c098ee0c72
commit
936ec66124
@ -30,6 +30,10 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#ifdef ERROR
|
||||||
|
#undef ERROR
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace lyx {
|
namespace lyx {
|
||||||
|
|
||||||
namespace support { class FileName; }
|
namespace support { class FileName; }
|
||||||
|
Loading…
Reference in New Issue
Block a user