github-code/json-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #884 from careles/mingw_win64-WIN32_LEAN_AND_MEAN-redefined

Browse Source 
fix macro WIN32_LEAN_AND_MEAN redefined
This commit is contained in:
Eric Hawicz
2025-01-09 00:12:09 -05:00
committed by GitHub
parent a304464807 51bcdd0000
commit 7bca694b47
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json_util.c
View File

@@ -38,7 +38,9 @@
#endif /* HAVE_UNISTD_H */ #endif /* HAVE_UNISTD_H */
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#endif /* defined(_WIN32) */ #endif /* defined(_WIN32) */

2
linkhash.c
View File

@@ -25,7 +25,9 @@
#endif #endif
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> /* Get InterlockedCompareExchange */ #include <windows.h> /* Get InterlockedCompareExchange */
#endif #endif