From 327e2560be187b3c7e503a6cf3b28b45b18ddd79 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 27 Oct 2015 14:48:19 -0500 Subject: [PATCH] Remove X11 preprocessor defines for mouse buttons --- include/openspace/util/mouse.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/openspace/util/mouse.h b/include/openspace/util/mouse.h index 73c5aa940a..896f4396d5 100644 --- a/include/openspace/util/mouse.h +++ b/include/openspace/util/mouse.h @@ -65,6 +65,16 @@ enum class MouseAction { Repeat = 2 }; +// The X11 library header files define Button1-Button5 as defines, so they have to be +// removed before we can use them as unqualified identifiers for the enum ---abock +#ifdef unix +#undef Button1 +#undef Button2 +#undef Button3 +#undef Button4 +#undef Button5 +#endif // unix + enum class MouseButton { Button1 = 0, Button2 = 1,