diff options
| author | grischka <grischka> | 2013-01-24 19:49:58 +0100 |
|---|---|---|
| committer | grischka <grischka> | 2013-01-24 19:49:58 +0100 |
| commit | b89793d10a8cf1c3fa237d98cf4b656ac5aabf55 (patch) | |
| tree | b263391564043defbf806cbeee18d97c57d42980 | |
| parent | 6b6eea60f3ff5134b990123127d3574955169a4f (diff) | |
| download | tinycc-b89793d10a8cf1c3fa237d98cf4b656ac5aabf55.tar.gz tinycc-b89793d10a8cf1c3fa237d98cf4b656ac5aabf55.tar.bz2 | |
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.
| -rw-r--r-- | include/stddef.h | 2 | ||||
| -rw-r--r-- | win32/include/_mingw.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/stddef.h b/include/stddef.h index c5dd13c..fbc61fc 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 00ff2fc..0d2f039 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 |