6 files changed, 2 insertions, 26 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
  */
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c
index 5eccbd5e92..4e3a95780f 100644
--- a/ui/gtk/bytes_view.c
+++ b/ui/gtk/bytes_view.c
@@ -41,10 +41,6 @@
 
 #include "packet_panes.h"
 
-#ifndef offsetof
-#define offsetof(type, member)  ((size_t)(&((type *)0)->member))
-#endif
-
 #define MARGIN 2
 #define REFRESH_TIMEOUT 10
 
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index fe078cc311..97eed67cf4 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -491,19 +491,17 @@ typedef struct nspr_pktracepart_v26
 } nspr_pktracepart_v26_t;
 #define nspr_pktracepart_v26_s    ((guint32)(sizeof(nspr_pktracepart_v26_t)))
 
-#define myoffsetof(type,fieldname) (&(((type*)0)->fieldname))
-
 #define __TNDO(phdr,enumprefix,structname,hdrname)\
     static const guint8 enumprefix##_##hdrname##_offset = (guint8)sizeof(nspr_##structname##_t);
 
 #define __TNO(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(myoffsetof(nspr_##structname##_t,structprefix##_##structfieldname));
+    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(offsetof(nspr_##structname##_t,structprefix##_##structfieldname));
 
 #define __TNL(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
     static const guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structprefix##_##structfieldname);
 
 #define __TNV1O(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(myoffsetof(nspr_##structname##_t,structfieldname));
+    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(offsetof(nspr_##structname##_t,structfieldname));
 
 #define __TNV1L(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
     static const guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structfieldname);