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 /epan/dissectors/packet-lbm.h | |
| 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 'epan/dissectors/packet-lbm.h')
| -rw-r--r-- | epan/dissectors/packet-lbm.h | 6 |
1 files changed, 5 insertions, 1 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 |