Do not redefine a stripped-down LyXRC object.

I am not sure why it was done this way, but it is not really necessary.
Moreover gcc LTO does not like it.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 023e73e96b44e45facfb9af06232bd0164a0287b..ceea5d17427a71c69a60127abd74c7d5fd0fb888 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -12,6 +12,8 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/ConsoleApplication.h"
 #include "support/debug.h"
 #include "support/FileName.h"
@@ -70,9 +72,8 @@ namespace lyx {
 bool verbose = false;
 
 // Dummy LyXRC support
-struct LyXRC {
-       string icon_set;
-} lyxrc;
+LyXRC::LyXRC() {}
+LyXRC lyxrc;
 
 // Keep the linker happy on Windows
 void lyx_exit(int)

diff --git a/src/tex2lyx/dummy_impl.cpp b/src/tex2lyx/dummy_impl.cpp
index 79278f40a379f59312f4cf0d2a1f240ac921bad7..f38526f1181e8dc672634f6cd74b45517a7c00d8 100644 (file)
--- a/src/tex2lyx/dummy_impl.cpp
+++ b/src/tex2lyx/dummy_impl.cpp
@@ -20,6 +20,7 @@
 
 #include "Format.h"
 #include "LaTeXFeatures.h"
+#include "LyXRC.h"
 #include "output_xhtml.h"
 
 #include "support/Messages.h"
@@ -58,7 +59,8 @@ bool verbose = false;
 //
 
 
-class LyXRC {} lyxrc;
+LyXRC::LyXRC() {}
+LyXRC lyxrc;
 
 
 //