From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 4 Oct 2016 00:13:09 +0000 (+0000)
Subject: Assume that offsetof is provided by stddef.h
X-Git-Tag: v4.14~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7082acc0e3c68380db60f9124f4ef9abb22649a2;p=strace

Assume that offsetof is provided by stddef.h

According to C89, <stddef.h> shall define offsetof macro.

* defs.h: Include <stddef.h> unconditionally.
[!offsetof]: Remove.
---

diff --git a/defs.h b/defs.h
index 62f38b23..2b4118b5 100644
--- a/defs.h
+++ b/defs.h
@@ -39,9 +39,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <sys/types.h>
-#ifdef STDC_HEADERS
-# include <stddef.h>
-#endif
+#include <stddef.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -70,11 +68,6 @@ const char *strerror(int);
 extern char *stpcpy(char *dst, const char *src);
 #endif
 
-#ifndef offsetof
-# define offsetof(type, member)	\
-	(((char *) &(((type *) NULL)->member)) - ((char *) (type *) NULL))
-#endif
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 /* macros */