X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fstddef.h;h=f25b86396e80a015490a6aec521cb38ab36ab118;hb=c87d75f2aa6fde49a99cf3287e535a14f354f781;hp=dbf5a4ae1fe987b9059fe2510171634c4db51bb6;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/include/stddef.h b/include/stddef.h
index dbf5a4ae..f25b8639 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,9 +1,10 @@
 #ifndef _STDDEF_H
 #define _STDDEF_H
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#elif defined(__cplusplus)
+#define NULL 0L
 #else
 #define NULL ((void*)0)
 #endif
@@ -11,9 +12,16 @@
 #define __NEED_ptrdiff_t
 #define __NEED_size_t
 #define __NEED_wchar_t
+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
+#define __NEED_max_align_t
+#endif
 
 #include <bits/alltypes.h>
 
+#if __GNUC__ > 3
+#define offsetof(type, member) __builtin_offsetof(type, member)
+#else
 #define offsetof(type, member) ((size_t)( (char *)&(((type *)0)->member) - (char *)0 ))
+#endif
 
 #endif