undef WIN32_LEAN_AND_MEAN instead of touching SOEM code.

orocos · Dec 13, 2019 · 4dc8bdd · 4dc8bdd
1 parent e0a62b3
commit 4dc8bdd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,6 +92,9 @@ catkin_package(
 # Thus, we add -fPIC here.
 # This allows us to still include this in any shared libraries we create.
 add_compile_options(-fPIC)
+# removed any pre-defined `WIN32_LEAN_AND_MEAN`.
+# Otherwise, many symbols will be reported as missing.
+remove_definitions(-DWIN32_LEAN_AND_MEAN)
 #catkin_lint: ignore duplicate_cmd
 #catkin_lint: ignore subproject
 add_subdirectory(SOEM)
diff --git a/SOEM/osal/win32/osal.c b/SOEM/osal/win32/osal.c
@@ -3,11 +3,7 @@
  * LICENSE file in the project root for full license information
  */
 
-#ifdef WIN32_LEAN_AND_MEAN
-#undef WIN32_LEAN_AND_MEAN
-#endif
 #include <winsock2.h>
-#include <malloc.h>
 #include <osal.h>
 #include "osal_win32.h"
 

diff --git a/SOEM/oshw/win32/oshw.c b/SOEM/oshw/win32/oshw.c
@@ -3,7 +3,6 @@
  * LICENSE file in the project root for full license information
  */
 
-#include <malloc.h>
 #include "oshw.h"
 
 /**