mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
Merge pull request #1111 from vedgy/undef-common-words-x11
Undef common words defined in X11 headers
This commit is contained in:
commit
eb6a7c83a6
|
@ -12,9 +12,9 @@
|
|||
#include <QX11Info>
|
||||
#include <X11/Xlibint.h>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
#undef Bool
|
||||
#endif
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#endif
|
||||
|
||||
|
|
3
main.cc
3
main.cc
|
@ -9,6 +9,9 @@
|
|||
|
||||
#include "processwrapper.hh"
|
||||
#include "hotkeywrapper.hh"
|
||||
#ifdef HAVE_X11
|
||||
#include <fixx11h.h>
|
||||
#endif
|
||||
|
||||
//#define __DO_DEBUG
|
||||
|
||||
|
|
|
@ -66,6 +66,7 @@
|
|||
#ifdef HAVE_X11
|
||||
#include <QX11Info>
|
||||
#include <X11/Xlib.h>
|
||||
#include <fixx11h.h>
|
||||
#endif
|
||||
|
||||
#define MIN_THREAD_COUNT 4
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "wordfinder.hh"
|
||||
#include "dictionarybar.hh"
|
||||
#include "history.hh"
|
||||
#include "hotkeywrapper.hh"
|
||||
#include "mainstatusbar.hh"
|
||||
#include "mruqmenu.hh"
|
||||
#include "translatebox.hh"
|
||||
|
@ -32,6 +31,7 @@
|
|||
#include "fulltextsearch.hh"
|
||||
#include "helpwindow.hh"
|
||||
|
||||
#include "hotkeywrapper.hh"
|
||||
#ifdef HAVE_X11
|
||||
#include <fixx11h.h>
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue