Skip to content

Commit 61bfa00

Browse files
Use consistent conditionals in render_system.hpp (#1294) (#1297)
These header files define the XVisualInfo type, which is used later in this header based on different conditionals. In particular, the evaluation of these conditionals differ on BSD, which appears to have the headers needed so I don't believe that __linux__ is the correct conditional to use. Signed-off-by: Scott K Logan <[email protected]> (cherry picked from commit 0d95ae1) Co-authored-by: Scott K Logan <[email protected]>
1 parent 89123d4 commit 61bfa00

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rviz_rendering/include/rviz_rendering/render_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
#include <QDir> // NOLINT cpplint cannot handle include order here
4444

45-
#ifdef __linux__
45+
#if !defined(__APPLE__) && !defined(_WIN32)
4646

4747
#include <X11/Xutil.h>
4848
#include <GL/glx.h>

0 commit comments

Comments
 (0)