diff options
| author | Anders <anders.broman@ericsson.com> | 2015-06-02 15:23:33 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-03 10:44:16 +0000 |
| commit | 360a7ec9ae0d921cdaa041fd02d4cb44b4d95dbb (patch) | |
| tree | eb16a0e37da3a08027ad427448b1045cfa3445d8 /ui | |
| parent | bef4da8f98d5672ddabb8e91fc4596f4e4533c3f (diff) | |
G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,
use offsetof if defined or define it ourselfs as done in other
places in our code base.
Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370
Reviewed-on: https://code.wireshark.org/review/8735
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/bytes_view.c | 7 |
1 files changed, 6 insertions, 1 deletions
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, |