diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-03-04 13:26:36 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2021-03-06 20:57:22 +0300 |
| commit | 6e42e2b5015de31c9bc8be1c82c5e89c847f36da (patch) | |
| tree | 637ca87259a680f5391a4099b7ac8369fffdda53 | |
| parent | dda161138b3e48e9d1f01f7de07e4347691e9f69 (diff) | |
REFAC(client, unix): #undef conflicting macro "None"
| -rw-r--r-- | src/mumble/GlobalShortcut_unix.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |