diff options
| -rw-r--r-- | epan/dissectors/packet-lbm.h | 6 | ||||
| -rw-r--r-- | ui/gtk/bytes_view.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h index 9fd3145c55..b258a9b836 100644 --- a/epan/dissectors/packet-lbm.h +++ b/epan/dissectors/packet-lbm.h @@ -92,13 +92,17 @@ #include <sys/types.h> #include <netinet/in.h> #endif +#include <stddef.h> typedef guint8 lbm_uint8_t; typedef guint16 lbm_uint16_t; typedef guint32 lbm_uint32_t; typedef guint64 lbm_uint64_t; #define SIZEOF(TYPE, MEMBER) (gint)(sizeof(((TYPE *)0)->MEMBER)) -#define OFFSETOF(TYPE, MEMBER) ((gint)G_STRUCT_OFFSET(TYPE, MEMBER)) +#ifndef offsetof +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) +#endif +#define OFFSETOF(TYPE, MEMBER) (gint)(offsetof(TYPE, MEMBER)) #define STRINGIZE(a) #a #define MAKESTRING(a) STRINGIZE(a) #define LBM_OTID_BLOCK_SZ 32 diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 8069a6259a..5eccbd5e92 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -33,6 +33,7 @@ #include "ui/gtk/old-gtk-compat.h" #include <string.h> +#include <stddef.h> #include <epan/wmem/wmem.h> #include <epan/charsets.h> @@ -40,6 +41,10 @@ #include "packet_panes.h" +#ifndef offsetof +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) +#endif + #define MARGIN 2 #define REFRESH_TIMEOUT 10 @@ -1237,7 +1242,7 @@ bytes_view_class_init(BytesViewClass *klass) g_signal_new(g_intern_static_string("set-scroll-adjustments"), G_OBJECT_CLASS_TYPE(object_class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET(BytesViewClass, set_scroll_adjustments), + offsetof(BytesViewClass, set_scroll_adjustments), NULL, NULL, bv_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, |