From: Marat Radchenko Date: Tue, 29 Apr 2014 09:12:04 GMT Subject: [PATCH 10/12] MINGW: compat/poll/poll.c: undef NOGDI Message-ID: <1398762726-22825-11-git-send-email-marat@slonopotamus.org> In-Reply-To: <1398762726-22825-1-git-send-email-marat@slonopotamus.org> On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI. Removal -DNOGDI=1 from config.mak.uname has an undesirable effect of bringing in wingdi.h with weird #define ERROR 0 that conflicts with internal Git enums. So, just #undef NOGDI in compat/poll/poll.c. Signed-off-by: Marat Radchenko --- compat/poll/poll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 31163f2..e38cba8 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -38,6 +38,7 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# undef NOGDI # define WIN32_NATIVE # if defined (_MSC_VER) && !defined(_WIN32_WINNT) # define _WIN32_WINNT 0x0502 -- 1.9.1