diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:31:58 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:31:58 -0700 |
| commit | d0c789084ca7796562b19a190f9df31038aaa6df (patch) | |
| tree | 1bb4b55b7df8d520b7cfa30dcd07cadc009547f6 /compat/nedmalloc/malloc.c.h | |
| parent | 87bcf148d7a2dd585bbb6ed18dae83a42b45a67a (diff) | |
| parent | 8453c1259a3b6fe89d67b6e783cc535b60f298c1 (diff) | |
| download | git-d0c789084ca7796562b19a190f9df31038aaa6df.tar.gz | |
Merge branch 'kb/msvc-compile'
* kb/msvc-compile:
Windows: do not redefine _WIN32_WINNT
MinGW: Fix stat definitions to work with MinGW runtime version 4.0
MSVC: fix stat definition hell
MSVC: fix compile errors due to macro redefinitions
MSVC: fix compile errors due to missing libintl.h
Diffstat (limited to 'compat/nedmalloc/malloc.c.h')
| -rw-r--r-- | compat/nedmalloc/malloc.c.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index ed4f1fa5af..f216a2a7d3 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -499,7 +499,9 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP #endif /* WIN32 */ #ifdef WIN32 #define WIN32_LEAN_AND_MEAN +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x403 +#endif #include <windows.h> #define HAVE_MMAP 1 #define HAVE_MORECORE 0 |