Skip to content

Commit 7bca694

Browse files
authored
Merge pull request json-c#884 from careles/mingw_win64-WIN32_LEAN_AND_MEAN-redefined
fix macro WIN32_LEAN_AND_MEAN redefined
2 parents a304464 + 51bcdd0 commit 7bca694

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

json_util.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#endif /* HAVE_UNISTD_H */
3939

4040
#ifdef _WIN32
41+
#ifndef WIN32_LEAN_AND_MEAN
4142
#define WIN32_LEAN_AND_MEAN
43+
#endif
4244
#include <io.h>
4345
#include <windows.h>
4446
#endif /* defined(_WIN32) */

linkhash.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#endif
2626

2727
#if defined(_MSC_VER) || defined(__MINGW32__)
28+
#ifndef WIN32_LEAN_AND_MEAN
2829
#define WIN32_LEAN_AND_MEAN
30+
#endif
2931
#include <windows.h> /* Get InterlockedCompareExchange */
3032
#endif
3133

0 commit comments

Comments
 (0)