aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mstp.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2010-11-04 06:36:33 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2010-11-04 06:36:33 +0000
commitb7920c07c5db806c4bcff19308a0242a5484e89d (patch)
tree182d5aec8ed0730ae96c8bb0c1375d604849baca /epan/dissectors/packet-mstp.c
parent9675740701929afcd6b3096ab6a3fc05ac5255e5 (diff)
From Alexis La Goutte:
Replace all *_min()/*_max() by MIN() and MAX(). svn path=/trunk/; revision=34767
Diffstat (limited to 'epan/dissectors/packet-mstp.c')
-rw-r--r--epan/dissectors/packet-mstp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 51113d31ce..ff999e74e8 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -261,7 +261,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
#if defined(BACNET_MSTP_CHECKSUM_VALIDATE)
/* 16-bit checksum - calculate to validate */
- max_len = min(mstp_frame_pdu_len, mstp_tvb_pdu_len);
+ max_len = MIN(mstp_frame_pdu_len, mstp_tvb_pdu_len);
for (i = 0; i < max_len; i++) {
crcdata = tvb_get_guint8(tvb, offset+i);
crc16 = CRC_Calc_Data(crcdata, crc16);