hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #1111 from vedgy/undef-common-words-x11

Browse source 
Undef common words defined in X11 headers
This commit is contained in:
Abs62 2019-01-28 18:30:41 +03:00 committed by GitHub
parent 15cbce1a7f ebfeb37f56
commit eb6a7c83a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hotkeywrapper.hh
View file

@ -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
View file

@ -9,6 +9,9 @@
#include "processwrapper.hh"
#include "hotkeywrapper.hh"
#ifdef HAVE_X11
#include <fixx11h.h>
#endif
//#define __DO_DEBUG

1
mainwindow.cc
View file

@ -66,6 +66,7 @@
#ifdef HAVE_X11
#include <QX11Info>
#include <X11/Xlib.h>
#include <fixx11h.h>
#endif
#define MIN_THREAD_COUNT 4

2
mainwindow.hh
View file

@ -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