From 51bcdd0000263d6e768911d1ac5f5733dbc344d9 Mon Sep 17 00:00:00 2001 From: Careles Date: Mon, 6 Jan 2025 10:56:53 +0800 Subject: [PATCH] fix macro WIN32_LEAN_AND_MEAN redefined json-c as add_subdirectory and project cmakelists.txt has add_definitions(-DWIN32_LEAN_AND_MEAN) --- json_util.c | 2 ++ linkhash.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/json_util.c b/json_util.c index 4da3efb4..2b5f858f 100644 --- a/json_util.c +++ b/json_util.c @@ -38,7 +38,9 @@ #endif /* HAVE_UNISTD_H */ #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif #include #include #endif /* defined(_WIN32) */ diff --git a/linkhash.c b/linkhash.c index 5e12c51e..58e13130 100644 --- a/linkhash.c +++ b/linkhash.c @@ -25,7 +25,9 @@ #endif #if defined(_MSC_VER) || defined(__MINGW32__) +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif #include /* Get InterlockedCompareExchange */ #endif -- 2.39.5