Fix definition clashes in unity build

This commit is contained in:
Robbert van der Helm
2021-07-10 19:38:24 +02:00
parent 091ab0f0df
commit 998e222651
3 changed files with 16 additions and 13 deletions
+2 -6
View File
@@ -54,12 +54,8 @@ constexpr size_t idle_timer_id = 1337;
*/
constexpr char active_window_property_name[] = "_NET_ACTIVE_WINDOW";
/**
* The name of the X11 property that indicates whether a window supports
* drag-and-drop. If the `editor_force_dnd` option is enabled we'll remove this
* property from `topmost_window` to work around a bug in REAPER.
*/
constexpr char xdnd_aware_property_name[] = "XdndAware";
// `xdnd_aware_property_name` was moved to `editor.h` so the unity build
// succeeds
/**
* Client message name for XEmbed messages. See
+13 -6
View File
@@ -33,12 +33,6 @@
#include "utils.h"
#include "xdnd-proxy.h"
/**
* The most significant bit in an X11 event's response type is used to indicate
* the event source.
*/
constexpr uint8_t xcb_event_type_mask = 0b0111'1111;
/**
* The maximum number of Win32 messages to handle per message loop. This is
* needed because otherwise some plugins can run into an infinite loop. I've
@@ -50,6 +44,19 @@ constexpr uint8_t xcb_event_type_mask = 0b0111'1111;
*/
constexpr int max_win32_messages [[maybe_unused]] = 20;
/**
* The most significant bit in an X11 event's response type is used to indicate
* the event source.
*/
constexpr uint8_t xcb_event_type_mask = 0b0111'1111;
/**
* The name of the X11 property that indicates whether a window supports
* drag-and-drop. If the `editor_force_dnd` option is enabled we'll remove this
* property from `topmost_window` to work around a bug in REAPER.
*/
constexpr char xdnd_aware_property_name[] = "XdndAware";
/**
* Get the atom with the specified name. May throw when
* `xcb_intern_atom_reply()` returns an error. Returns `XCB_ATOM_NONE` when the
+1 -1
View File
@@ -41,7 +41,7 @@ constexpr char OLEDD_DRAGTRACKERCLASS[] = "WineDragDropTracker32";
// These are the XDND atom names as described in
// https://www.freedesktop.org/wiki/Specifications/XDND/#atomsandproperties
constexpr char xdnd_selection_name[] = "XdndSelection";
constexpr char xdnd_aware_property_name[] = "XdndAware";
// xdnd_aware_property_name is defined in `editor.h``
constexpr char xdnd_proxy_property_name[] = "XdndProxy";
/**