aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ethercat/packet-ecatmb.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-04-16 03:38:23 +0000
committerGerald Combs <gerald@wireshark.org>2009-04-16 03:38:23 +0000
commit17f0d877faff64832b2a93f24d21b873fe59919e (patch)
tree253e33214029012feff56f1b85d83121fef627cf /plugins/ethercat/packet-ecatmb.h
parent605ef095f929bf68880009342d530112bde91cc6 (diff)
Fix Win64 compilation problems in the plugins directory.
svn path=/trunk/; revision=28064
Diffstat (limited to 'plugins/ethercat/packet-ecatmb.h')
-rw-r--r--plugins/ethercat/packet-ecatmb.h14
1 files changed, 7 insertions, 7 deletions
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);