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/poll/poll.c | |
| parent | 87bcf148d7a2dd585bbb6ed18dae83a42b45a67a (diff) | |
| parent | 8453c1259a3b6fe89d67b6e783cc535b60f298c1 (diff) | |
| download | git-d0c789084ca7796562b19a190f9df31038aaa6df.tar.gz git-d0c789084ca7796562b19a190f9df31038aaa6df.tar.xz | |
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/poll/poll.c')
| -rw-r--r-- | compat/poll/poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 44103103a..31163f2ae 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -39,7 +39,7 @@ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # define WIN32_NATIVE -# if defined (_MSC_VER) +# if defined (_MSC_VER) && !defined(_WIN32_WINNT) # define _WIN32_WINNT 0x0502 # endif # include <winsock2.h> |