From 5c3af359a8e756f0ea3192493b661619a1a91bc9 Mon Sep 17 00:00:00 2001 From: Mitja P Date: Sat, 28 Oct 2023 11:52:15 -0700 Subject: [PATCH] fix compilation with WIN32_LEAN_AND_MEAN --- .github/workflows/ros_workspace.yml | 4 ++-- common/time_util.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ros_workspace.yml b/.github/workflows/ros_workspace.yml index 7315b26b..e7ba7c22 100644 --- a/.github/workflows/ros_workspace.yml +++ b/.github/workflows/ros_workspace.yml @@ -104,7 +104,7 @@ jobs: colcon-defaults: | { "build": { - "cmake-args": [ "-DBUILD_SHARED_LIBS=OFF" ] + "cmake-args": [ "-DBUILD_SHARED_LIBS=OFF", "-DCMAKE_CXX_FLAGS='/DWIN32_MEAN_AND_LEAN'" ] } } @@ -117,7 +117,7 @@ jobs: colcon-defaults: | { "build": { - "cmake-args": [ "-DBUILD_SHARED_LIBS=OFF" ] + "cmake-args": [ "-DBUILD_SHARED_LIBS=OFF", "-DCMAKE_CXX_FLAGS='/DWIN32_MEAN_AND_LEAN'" ] } } diff --git a/common/time_util.h b/common/time_util.h index 207e9583..77eca6c1 100644 --- a/common/time_util.h +++ b/common/time_util.h @@ -32,7 +32,7 @@ either expressed or implied, of the Regents of The University of Michigan. #include #ifdef _WIN32 -#include +#include typedef long long suseconds_t; #endif