From ae71d67518cb937bab31d09491c089460f8d1eba Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Fri, 5 Jan 2024 15:51:36 +0000 Subject: [PATCH] wip Signed-off-by: Roberto Scolaro --- userspace/libscap/win32/gettimeofday.h | 1 + userspace/libscap/win32/sleep.h | 1 + userspace/libsinsp/utils.cpp | 1 + userspace/plugin/plugin_loader.c | 1 + 4 files changed, 4 insertions(+) diff --git a/userspace/libscap/win32/gettimeofday.h b/userspace/libscap/win32/gettimeofday.h index d7b2fdd5e3c..773d4c24cfd 100644 --- a/userspace/libscap/win32/gettimeofday.h +++ b/userspace/libscap/win32/gettimeofday.h @@ -18,6 +18,7 @@ limitations under the License. #pragma once +#define NOMINMAX #include #include diff --git a/userspace/libscap/win32/sleep.h b/userspace/libscap/win32/sleep.h index 9bbe076effe..0571ae9c1ed 100644 --- a/userspace/libscap/win32/sleep.h +++ b/userspace/libscap/win32/sleep.h @@ -18,6 +18,7 @@ limitations under the License. #pragma once +#define NOMINMAX #include static inline void sleep_ms(int ms) diff --git a/userspace/libsinsp/utils.cpp b/userspace/libsinsp/utils.cpp index 162ec45a37a..6c4d9e16058 100644 --- a/userspace/libsinsp/utils.cpp +++ b/userspace/libsinsp/utils.cpp @@ -1020,6 +1020,7 @@ time_t get_epoch_utc_seconds_now() #ifdef _WIN32 #include +#define NOMINMAX #include const __int64 DELTA_EPOCH_IN_MICROSECS = 11644473600000000; diff --git a/userspace/plugin/plugin_loader.c b/userspace/plugin/plugin_loader.c index 9401c4186bc..43c03d80049 100644 --- a/userspace/plugin/plugin_loader.c +++ b/userspace/plugin/plugin_loader.c @@ -17,6 +17,7 @@ limitations under the License. */ #ifdef _WIN32 + #define NOMINMAX #include typedef HINSTANCE library_handle_t; #else