From 0d95ae1f1227ab9aa0327d0945d9aec8ed9f88e1 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 11 Nov 2024 03:31:49 -0600 Subject: [PATCH] Use consistent conditionals in render_system.hpp (#1294) 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 --- rviz_rendering/include/rviz_rendering/render_system.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rviz_rendering/include/rviz_rendering/render_system.hpp b/rviz_rendering/include/rviz_rendering/render_system.hpp index 6f9db3af1..028f5b74a 100644 --- a/rviz_rendering/include/rviz_rendering/render_system.hpp +++ b/rviz_rendering/include/rviz_rendering/render_system.hpp @@ -42,7 +42,7 @@ #include // NOLINT cpplint cannot handle include order here -#ifdef __linux__ +#if !defined(__APPLE__) && !defined(_WIN32) #include #include