undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: do not redefine _WIN32_WINNT

Browse Source 
With MinGW runtime version 4.0 this interferes with the previous
definition from sdkddkver.h.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sebastian Schuberth 2013-09-11 18:06:31 +02:00 committed by Junio C Hamano
parent fa93bb20d7
commit 8453c1259a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/nedmalloc/malloc.c.h
View File

@ -499,7 +499,9 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x403 #define _WIN32_WINNT 0x403
#endif
#include <windows.h> #include <windows.h>
#define HAVE_MMAP 1 #define HAVE_MMAP 1
#define HAVE_MORECORE 0 #define HAVE_MORECORE 0

2
compat/poll/poll.c
View File

@ -39,7 +39,7 @@
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# define WIN32_NATIVE # define WIN32_NATIVE
# if defined (_MSC_VER) # if defined (_MSC_VER) && !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0502 # define _WIN32_WINNT 0x0502
# endif # endif
# include <winsock2.h> # include <winsock2.h>

2
git-compat-util.h
View File

@ -86,7 +86,7 @@
#define _SGI_SOURCE 1 #define _SGI_SOURCE 1
#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */ #if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
# if defined (_MSC_VER) # if defined (_MSC_VER) && !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0502 # define _WIN32_WINNT 0x0502
# endif # endif
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */ #define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */