From bf62c27b451b1cb037c63ac7a1bf3259f1344c05 Mon Sep 17 00:00:00 2001 From: Marat Abrarov Date: Thu, 19 Mar 2026 23:22:57 +0300 Subject: [PATCH] metric: reduced windows.h include to avoid redeclaration conflicts Signed-off-by: Marat Abrarov --- include/cmetrics/cmt_compat.h | 6 ++++++ src/cmt_atomic_msvc.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/include/cmetrics/cmt_compat.h b/include/cmetrics/cmt_compat.h index 004c0aa8..9fc90a38 100644 --- a/include/cmetrics/cmt_compat.h +++ b/include/cmetrics/cmt_compat.h @@ -22,7 +22,13 @@ #include #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #include +#undef WIN32_LEAN_AND_MEAN +#else +#include +#endif #endif static inline struct tm *cmt_platform_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/cmt_atomic_msvc.c b/src/cmt_atomic_msvc.c index 3fd66dbf..3da37a75 100644 --- a/src/cmt_atomic_msvc.c +++ b/src/cmt_atomic_msvc.c @@ -18,7 +18,13 @@ */ #include +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #include +#undef WIN32_LEAN_AND_MEAN +#else +#include +#endif /* This allows cmt_atomic_initialize to be automatically called * as soon as the program starts if enabled.