Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-12 Thread Sebastian Schuberth
On Wed, Sep 11, 2013 at 11:51 PM, Junio C Hamano gits...@pobox.com wrote: It seems that compat/poll/poll.c also defines _WIN32_WINNT (but only with _MSC_VER defined). The change to git-compat-util.h in this patch avoids redefinition for both MinGW and MSVC case. Do you also need to have

[PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
With MinGW runtime version 4.0 this interferes with the previous definition from sdkddkver.h. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- compat/nedmalloc/malloc.c.h | 2 ++ git-compat-util.h | 2 ++ 2 files changed, 4 insertions(+) diff --git

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: diff --git a/git-compat-util.h b/git-compat-util.h index 664305c..f5c756d 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -93,7 +93,9 @@ #undef __NO_INLINE__ #ifdef WIN32 /* Both MinGW and MSVC */ +#ifndef _WIN32_WINNT

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
On Wed, Sep 11, 2013 at 8:29 PM, Junio C Hamano gits...@pobox.com wrote: This unfortunately does not seem to match what I have. I think the patch is based on the codebase before these two: 380395d0 (mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE, 2013-05-02) 41f29991 (msvc: Fix

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Junio C Hamano
for both MinGW and MSVC case. Do you also need to have this, too? Here is what I tentatively queued on top of the three from Karsten, and your Fix stat definitions. -- 8 -- From: Sebastian Schuberth sschube...@gmail.com Date: Wed, 11 Sep 2013 18:06:31 +0200 Subject: [PATCH] Windows: do