diff options
author | Gerald Combs <gerald@wireshark.org> | 2009-04-16 03:38:23 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2009-04-16 03:38:23 +0000 |
commit | 17f0d877faff64832b2a93f24d21b873fe59919e (patch) | |
tree | 253e33214029012feff56f1b85d83121fef627cf /plugins/ethercat | |
parent | 605ef095f929bf68880009342d530112bde91cc6 (diff) |
Fix Win64 compilation problems in the plugins directory.
svn path=/trunk/; revision=28064
Diffstat (limited to 'plugins/ethercat')
-rw-r--r-- | plugins/ethercat/packet-ecatmb.c | 2 | ||||
-rw-r--r-- | plugins/ethercat/packet-ecatmb.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 3623838afc..7c87c28840 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -1312,7 +1312,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree * char szText[200]; int nMax = sizeof(szText)-1; - guint mailbox_length = tvb_reported_length(tvb); + gint mailbox_length = tvb_reported_length(tvb); if( mailbox_length >= ETHERCAT_MBOX_HEADER_LEN ) { diff --git a/plugins/ethercat/packet-ecatmb.h b/plugins/ethercat/packet-ecatmb.h index eec89fc5f5..2d09a36154 100644 --- a/plugins/ethercat/packet-ecatmb.h +++ b/plugins/ethercat/packet-ecatmb.h @@ -31,7 +31,7 @@ typedef struct TETHERNET_ADDRESS { guint8 b[6]; } ETHERNET_ADDRESS, *PETHERNET_ADDRESS; -#define ETHERNET_ADDRESS_LEN sizeof(ETHERNET_ADDRESS) +#define ETHERNET_ADDRESS_LEN ((int) sizeof(ETHERNET_ADDRESS)) /* Mailbox*/ #define ETHERCAT_MBOX_TYPE_ADS 1 /* AMS/ADS header follows*/ @@ -60,7 +60,7 @@ typedef struct TETHERCAT_MBOX_HEADER MbxHeaderControlUnion aControlUnion; } ETHERCAT_MBOX_HEADER, *PETHERCAT_MBOX_HEADER; -#define ETHERCAT_MBOX_HEADER_LEN sizeof(ETHERCAT_MBOX_HEADER) +#define ETHERCAT_MBOX_HEADER_LEN ((int) sizeof(ETHERCAT_MBOX_HEADER)) /*/////////////////////////////////////////////////////////////////////////////*/ /* EoE*/ @@ -118,13 +118,13 @@ typedef struct TETHERCAT_EOE_MACFILTER ETHERNET_ADDRESS MacFilter[16]; ETHERNET_ADDRESS MacFilterMask[4]; } ETHERCAT_EOE_MACFILTER; -#define ETHERCAT_EOE_MACFILTER_LEN sizeof(ETHERCAT_EOE_MACFILTER) +#define ETHERCAT_EOE_MACFILTER_LEN ((int) sizeof(ETHERCAT_EOE_MACFILTER)) typedef struct TETHERCAT_EOE_TIMESTAMP { guint32 TimeStamp; /* 32 bit time stamp */ } ETHERCAT_EOE_TIMESTAMP; -#define ETHERCAT_EOE_TIMESTAMP_LEN sizeof(ETHERCAT_EOE_TIMESTAMP) +#define ETHERCAT_EOE_TIMESTAMP_LEN ((int) sizeof(ETHERCAT_EOE_TIMESTAMP)) typedef union tEoeHeaderDataUnion { @@ -157,7 +157,7 @@ typedef struct TETHERCAT_EOE_HEADER EoeHeaderInfoUnion anEoeHeaderInfoUnion; EoeHeaderDataUnion anEoeHeaderDataUnion; } ETHERCAT_EOE_HEADER, *PETHERCAT_EOE_HEADER; -#define ETHERCAT_EOE_HEADER_LEN sizeof(ETHERCAT_EOE_HEADER) +#define ETHERCAT_EOE_HEADER_LEN ((int) sizeof(ETHERCAT_EOE_HEADER)) /*/////////////////////////////////////////////////////////////////////////////*/ /* CANopen*/ @@ -180,7 +180,7 @@ typedef union TETHERCAT_COE_HEADER } v; guint16 header; } ETHERCAT_COE_HEADER, *PETHERCAT_COE_HEADER; -#define ETHERCAT_COE_HEADER_LEN sizeof(ETHERCAT_COE_HEADER) +#define ETHERCAT_COE_HEADER_LEN ((int) sizeof(ETHERCAT_COE_HEADER)) typedef union tSdoHeaderUnion @@ -475,7 +475,7 @@ typedef struct TETHERCAT_SOE_HEADER guint16 ErrorCode if (Error==1) } MailBoxDataUnion;*/ } ETHERCAT_SOE_HEADER, *PETHERCAT_SOE_HEADER; -#define ETHERCAT_SOE_HEADER_LEN sizeof(ETHERCAT_SOE_HEADER) +#define ETHERCAT_SOE_HEADER_LEN ((int) sizeof(ETHERCAT_SOE_HEADER)) extern void init_mbx_header(PETHERCAT_MBOX_HEADER pMbox, tvbuff_t *tvb, gint offset); |