cleanup(userspace): move NOMINMAX definition at compile time for wind…

…ows buils. Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · Dec 16, 2024 · 3126a97 · 3126a97
1 parent 07a16e9
commit 3126a97
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/cmake/modules/CompilerFlags.cmake b/cmake/modules/CompilerFlags.cmake
@@ -144,8 +144,8 @@ else() # MSVC
 	set(CMAKE_CXX_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
 
 	# "_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" enables a workaround for windows GH runner issue, see
-	# https://github.com/actions/runner-images/issues/10004
+	# https://github.com/actions/runner-images/issues/10004 Also, define NOMINMAX globally.
 	add_compile_definitions(
-		_HAS_STD_BYTE=0 WIN32_LEAN_AND_MEAN _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
+		_HAS_STD_BYTE=0 WIN32_LEAN_AND_MEAN _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR NOMINMAX
 	)
 endif()
diff --git a/userspace/libscap/scap_print_event.c b/userspace/libscap/scap_print_event.c
@@ -17,10 +17,6 @@ limitations under the License.
 #include <libscap/scap.h>
 #include <libscap/scap-int.h>
 #if defined(_WIN32)
-/* This prevents including <windows.h> when including Ws2tcpip.h */
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <Ws2tcpip.h>
 #else
 #include <arpa/inet.h>

diff --git a/userspace/libsinsp/event.cpp b/userspace/libsinsp/event.cpp
@@ -24,7 +24,6 @@ limitations under the License.
 #include <algorithm>
 #include <unistd.h>
 #else
-#define NOMINMAX
 #define localtime_r(a, b) (localtime_s(b, a) == 0 ? b : NULL)
 #endif
 

diff --git a/userspace/libsinsp/filter_compare.cpp b/userspace/libsinsp/filter_compare.cpp
@@ -22,7 +22,6 @@ limitations under the License.
 #include <libsinsp/memmem.h>
 
 #ifdef _WIN32
-#define NOMINMAX
 #pragma comment(lib, "Ws2_32.lib")
 #include <WinSock2.h>
 #include <WS2tcpip.h>

diff --git a/userspace/libsinsp/parsers.cpp b/userspace/libsinsp/parsers.cpp
@@ -17,7 +17,6 @@ limitations under the License.
 */
 
 #ifdef _WIN32
-#define NOMINMAX
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

diff --git a/userspace/libsinsp/sinsp_inet.h b/userspace/libsinsp/sinsp_inet.h
@@ -18,10 +18,6 @@ limitations under the License.
 #pragma once
 
 #if defined(_WIN32)
-/* This prevents including <windows.h> when including Ws2tcpip.h */
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <Ws2tcpip.h>
 #else
 #include <arpa/inet.h>