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

diff --git a/include/stddef.h b/include/stddef.h
index dbf5a4ae..9d522486 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,12 +1,7 @@
 #ifndef _STDDEF_H
 #define _STDDEF_H
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
 
 #define __NEED_ptrdiff_t
 #define __NEED_size_t
@@ -14,6 +9,10 @@
 
 #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