fix compilation with WIN32_LEAN_AND_MEAN

AprilRobotics · Oct 28, 2023 · c996dcf · c996dcf
1 parent cc655ad
commit c996dcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -32,7 +32,7 @@ either expressed or implied, of the Regents of The University of Michigan.
 #include <time.h>
 
 #ifdef _WIN32
-#include <windows.h>
+#include <Winsock2.h>
 typedef long long suseconds_t;
 #endif