merge r16030 to 8.09

SVN-Revision: 16032

diff --git a/package/libnl-tiny/src/include/netlink-local.h b/package/libnl-tiny/src/include/netlink-local.h
index a2000fa2ffffeb1b8d1831dbae874be39708b241..f952bbea45a2f8cff87bd79f72525c2182fd7749 100644 (file)
--- a/package/libnl-tiny/src/include/netlink-local.h
+++ b/package/libnl-tiny/src/include/netlink-local.h
@@ -109,7 +109,9 @@ static inline int nl_cb_call(struct nl_cb *cb, int type, struct nl_msg *msg)
 }
 
 #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
+#ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
 
 #define __init __attribute__ ((constructor))
 #define __exit __attribute__ ((destructor))