From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 26 Jul 2017 10:28:25 +0000 (+0000)
Subject: Move offsetofend from defs.h to macros.h
X-Git-Tag: v4.19~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a300de56c1073bfd3b475638a589e669b58886cc;p=strace

Move offsetofend from defs.h to macros.h

* defs.h (offsetofend): Move ...
* macros.h: ... here.
---

diff --git a/defs.h b/defs.h
index 87265bdb..a45d37b5 100644
--- a/defs.h
+++ b/defs.h
@@ -71,11 +71,6 @@ const char *strerror(int);
 extern char *stpcpy(char *dst, const char *src);
 #endif
 
-#ifndef offsetofend
-# define offsetofend(type, member) \
-	(offsetof(type, member) + sizeof(((type *)NULL)->member))
-#endif
-
 /* macros */
 #ifndef MAX
 # define MAX(a, b)		(((a) > (b)) ? (a) : (b))
diff --git a/macros.h b/macros.h
index 2913d60c..a4641349 100644
--- a/macros.h
+++ b/macros.h
@@ -35,4 +35,9 @@
 #define STRINGIFY(...)		#__VA_ARGS__
 #define STRINGIFY_VAL(...)	STRINGIFY(__VA_ARGS__)
 
+#ifndef offsetofend
+# define offsetofend(type_, member_)	\
+	(offsetof(type_, member_) + sizeof(((type_ *)0)->member_))
+#endif
+
 #endif /* !STRACE_MACROS_H */