anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not redefine a stripped-down LyXRC object.

Browse Source 
I am not sure why it was done this way, but it is not really necessary.
Moreover gcc LTO does not like it.
This commit is contained in:
Jean-Marc Lasgouttes 2019-04-18 11:53:36 +02:00
parent e2f53f0f25
commit c6754ed548
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/client.cpp
View File

@ -12,6 +12,8 @@
#include <config.h> #include <config.h>
#include "LyXRC.h"
#include "support/ConsoleApplication.h" #include "support/ConsoleApplication.h"
#include "support/debug.h" #include "support/debug.h"
#include "support/FileName.h" #include "support/FileName.h"
@ -70,9 +72,8 @@ namespace lyx {
bool verbose = false; bool verbose = false;
// Dummy LyXRC support // Dummy LyXRC support
struct LyXRC { LyXRC::LyXRC() {}
string icon_set; LyXRC lyxrc;
} lyxrc;
// Keep the linker happy on Windows // Keep the linker happy on Windows
void lyx_exit(int) void lyx_exit(int)

4
src/tex2lyx/dummy_impl.cpp
View File

@ -20,6 +20,7 @@
#include "Format.h" #include "Format.h"
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "LyXRC.h"
#include "output_xhtml.h" #include "output_xhtml.h"
#include "support/Messages.h" #include "support/Messages.h"
@ -58,7 +59,8 @@ bool verbose = false;
// //
class LyXRC {} lyxrc; LyXRC::LyXRC() {}
LyXRC lyxrc;
// //