From b89793d10a8cf1c3fa237d98cf4b656ac5aabf55 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Thu, 24 Jan 2013 19:49:58 +0100
Subject: [PATCH] win32: _mingw.h: do not undef NULL

Not wise if stddef.h was already included. This is related to commit

    3aa26a794e24a298493a2bc9d70fbd9aebf6437a

Instead hack stddef.h to have identical definition and thus
avoid the issue mentionned there.
---
 include/stddef.h       | 2 +-
 win32/include/_mingw.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/stddef.h b/include/stddef.h
index c5dd13c3..fbc61fcd 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -20,7 +20,7 @@ typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
 #endif
 
-#define NULL ((void *)0)
+#define NULL ((void*)0)
 #define offsetof(type, field) ((size_t)&((type *)0)->field)
 
 void *alloca(size_t size);
diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index 00ff2fcd..0d2f0395 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -19,7 +19,6 @@
 #define __MINGW_H
 
 /* some winapi files define these before including _mingw.h --> */
-#undef NULL
 #undef __cdecl
 #undef _X86_
 #undef WIN32
-- 
2.11.4.GIT