X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=88f93036e029ae4b9c4dd959cf5d7e74cab074fb;hb=7800c057884f6a950bb21bce351968f50679f18c;hp=94fe003bd80fa372fb5af73ce7323ae42861ba87;hpb=3c9b62a69d894b5ea020c18d0bec676dc00fe378;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 94fe003bd8..88f93036e0 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; }
@@ -398,7 +402,7 @@ public:
 	/// happen).  -- Idea JMarc, comment MV
 	InsetLayout const & insetLayout(docstring const & name) const;
 	/// a plain inset layout for use as a default
-	static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+	static InsetLayout const & plainInsetLayout();
 	/// add a new layout \c name if it does not exist in layoutlist_
 	/// \return whether we had to add one.
 	bool addLayoutIfNeeded(docstring const & name) const;
@@ -494,8 +498,6 @@ private:
 	friend DocumentClassPtr
 		getDocumentClass(LayoutFile const &, LayoutModuleList const &,
 				 bool const clone);
-	///
-	static InsetLayout plain_insetlayout_;
 };