{
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*/
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*/
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
{
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*/
} 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
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);
*dst++ = c;
}
- next_tvb = tvb_new_real_data(data, dst-data, dst-data);
+ next_tvb = tvb_new_real_data(data, (guint) (dst-data), (guint) (dst-data));
tvb_set_free_cb(next_tvb, g_free);
tvb_set_child_real_data_tvbuff(tvb, next_tvb);
add_new_data_source(pinfo, next_tvb, "Unescaped SIR");
LEMON=..\..\tools\lemon
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
+# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
+GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=/WX $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
mate_parser_lex.h : mate_parser.c
mate_parser.obj : mate_parser.c
+ $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
mate_grammar.h : mate_grammar.c
mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe
static void
set_ascii_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len){
char *buffer=NULL;
- guint16 buffer_index=0;
+ gsize buffer_index=0;
guint16 msg_index=0;
guint8 character;
char *label="DATA: ";
static void
set_ascii_null_term_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len,char *label){
char *buffer=NULL;
- guint16 buffer_index=0;
+ gsize buffer_index=0;
guint16 msg_index=0;
guint8 character;
#define MAX_BUFFER 1024
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
+# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
+GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=/WX $(GENERATED_CFLAGS)
+
+
+
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
wimaxasncp_dict_lex.h : wimaxasncp_dict.c
wimaxasncp_dict.obj : wimaxasncp_dict.c
+ $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
clean:
rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \