diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-12-17 22:57:55 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-12-18 05:49:45 +0000 |
| commit | e1ed7598ee2cc884d28a05533d9060b56ceb7976 (patch) | |
| tree | 46d656b34951a7e8e27ffc1708f78c26f2c648c8 /epan | |
| parent | a0ad55db4247c31b3375f53ab4a8b0ecea473348 (diff) | |
Removed local definitions of offsetof().
The offsetof() macro is an ANSI C library feature.
Change-Id: I2ac91b0b4c94c6f6baf14133b076fdc5ed2e182b
Reviewed-on: https://code.wireshark.org/review/12707
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-aodv.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-bgp.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 4 |
4 files changed, 0 insertions, 18 deletions
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 61bc0feba4..28e8d2148c 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -29,10 +29,6 @@ #include <epan/to_str.h> #include <epan/expert.h> -#ifndef offsetof -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif - /* * See * diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 56f7094d25..ee33973bf3 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -603,11 +603,6 @@ void proto_reg_handoff_bgp(void); #define BGP_NLRI_TLV_LEN_NODE_FLAG_BITS 1 -#ifndef offsetof -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif - - static const value_string bgptypevals[] = { { BGP_OPEN, "OPEN Message" }, { BGP_UPDATE, "UPDATE Message" }, diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index d0dba8a0c7..f6efbc0def 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -604,11 +604,6 @@ static gboolean g_esp_do_sequence_analysis = TRUE; /* Place AH payload in sub tree */ static gboolean g_ah_payload_in_subtree = FALSE; -#ifndef offsetof -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif - - #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 058f31ce08..b6ce19979d 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -491,10 +491,6 @@ static gboolean try_heuristic_first = FALSE; /* Display IPv6 extension headers under the root tree */ static gboolean ipv6_exthdr_under_root = FALSE; -#ifndef offsetof -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif - /* * defragmentation of IPv6 */ |