Move offsetofend from defs.h to macros.h

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

diff --git a/defs.h b/defs.h
index 87265bdb435b249916d301365ddfc9791d070ac2..a45d37b53677bc217edcf92d9b782ca0cd6cc706 100644 (file)
--- 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 2913d60c9014a5f041dca6b1752e5fa07c385ed3..a4641349bdb156560bf0f7159ae147cb449a67f5 100644 (file)
--- 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 */