]> granicus.if.org Git - strace/commitdiff
Assume that offsetof is provided by stddef.h
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 4 Oct 2016 00:13:09 +0000 (00:13 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 4 Oct 2016 00:16:44 +0000 (00:16 +0000)
According to C89, <stddef.h> shall define offsetof macro.

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

defs.h

diff --git a/defs.h b/defs.h
index 62f38b23980475f87d9803efc088d9e52703f559..2b4118b5a863f710c8630734367b71c2fd4578db 100644 (file)
--- 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 */