Skip to content

Commit 327fd30

Browse files
committed
Windows: Do not redefine _WIN32_WINNT
With MinGW runtime version 4.0 this interferes with the previous definition from sdkddkver.h. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 5ea17ad commit 327fd30

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

compat/nedmalloc/malloc.c.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,9 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP
495495
#endif /* WIN32 */
496496
#ifdef WIN32
497497
#define WIN32_LEAN_AND_MEAN
498+
#ifndef _WIN32_WINNT
498499
#define _WIN32_WINNT 0x403
500+
#endif
499501
#include <windows.h>
500502
#define HAVE_MMAP 1
501503
#define HAVE_MORECORE 0

git-compat-util.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
#endif
106106

107107
#ifdef WIN32 /* Both MinGW and MSVC */
108+
#ifndef _WIN32_WINNT
108109
#define _WIN32_WINNT 0x0502
110+
#endif
109111
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
110112
#include <winsock2.h>
111113
#include <windows.h>

0 commit comments

Comments
 (0)