commit c6754ed548deecdc37c5a019fb1e5a705dc44da5
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Thu Apr 18 11:53:36 2019 +0200
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.
---
src/client/client.cpp | 7 ++++---
src/tex2lyx/dummy_impl.cpp | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 023e73e..ceea5d1 100644
--- 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 79278f4..f38526f 100644
--- 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;
//