From 6e42e2b5015de31c9bc8be1c82c5e89c847f36da Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Thu, 4 Mar 2021 11:26:36 +0100 Subject: REFAC(client, unix): #undef conflicting macro "None" --- src/mumble/GlobalShortcut_unix.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index bfa849aa6..1a220c106 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -43,4 +43,8 @@ public slots: void directoryChanged(const QString &); }; +// These are macros that X11/X.h defines and that are causing problems in unity builds +// if left defined +#undef None + #endif -- cgit v1.2.3