diff options
| author | Christian Ruppert <idl0r@gentoo.org> | 2011-06-21 00:05:08 +0200 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2011-06-21 11:33:44 +0200 |
| commit | 4806c5c058ba95b0c88af7731d26dad427d2fcb8 (patch) | |
| tree | 505ee4244dbea150f74ecb55cddfef8d6a7c15a5 | |
| parent | e56eb065b259069407418d2583ee2ee508bf4d70 (diff) | |
| download | libnl-4806c5c058ba95b0c88af7731d26dad427d2fcb8.tar.gz | |
Don't redefine offsetof when already defined by e.g. stddef.h
| -rw-r--r-- | include/netlink-local.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/netlink-local.h b/include/netlink-local.h index 63dd661..01c611a 100644 --- a/include/netlink-local.h +++ b/include/netlink-local.h @@ -43,6 +43,7 @@ #include <linux/if.h> #include <linux/if_arp.h> #include <linux/if_ether.h> +#include <linux/ethtool.h> #include <linux/pkt_sched.h> #include <linux/pkt_cls.h> #include <linux/gen_stats.h> @@ -126,7 +127,11 @@ 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])) + +/* This is also defined in stddef.h */ +#ifndef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) +#endif #define __init __attribute__ ((constructor)) #define __exit __attribute__ ((destructor)) |