From b34a2df4c706838e680bdcd15528862c49b5ba6c Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 3 Dec 2011 11:20:57 +0000 Subject: [PATCH] Windows: Use roken's min and max roken provides min() and max() macros. Use these, rather than our own MIN() and MAX() Change-Id: I82456c061cb274490e2ef2966a7075c2bde1f016 Reviewed-on: http://gerrit.openafs.org/6196 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/WINNT/afsd/cm_dcache.c | 4 ++-- src/WINNT/afsd/cm_dns.c | 2 +- src/WINNT/afsd/cm_vnodeops.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 9a7e82a..0fdee23 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -1950,7 +1950,7 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp osi_assertx(bufferp != NULL, "null cm_buf_t"); - len = MIN(tiov[iov].iov_len - iov_offset, cm_data.buf_blockSize - buffer_offset); + len = min(tiov[iov].iov_len - iov_offset, cm_data.buf_blockSize - buffer_offset); memcpy(bufferp + buffer_offset, tiov[iov].iov_base + iov_offset, len); iov_offset += len; buffer_offset += len; @@ -2396,7 +2396,7 @@ long cm_GetData(cm_scache_t *scp, osi_hyper_t *offsetp, char *datap, int data_le osi_assertx(bufferp != NULL, "null cm_buf_t"); - len = MIN(tiov[iov].iov_len - iov_offset, data_length - buffer_offset); + len = min(tiov[iov].iov_len - iov_offset, data_length - buffer_offset); memcpy(bufferp + buffer_offset, tiov[iov].iov_base + iov_offset, len); iov_offset += len; buffer_offset += len; diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index ed0bf48..e03c8a6 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -509,7 +509,7 @@ void processReplyBuffer_AFSDB(SOCKET commSock, PDNS_HDR replyBuff, int *cellHost /* ptr should now be at the start of the answer RR sections */ - answerCount = MIN(answerCount, AFSMAXCELLHOSTS); + answerCount = min(answerCount, AFSMAXCELLHOSTS); #ifdef DEBUG fprintf(stderr, "processRep_AFSDB: answerCount=%d\n", answerCount); #endif /* DEBUG */ diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c index 20ee837..df867bb 100644 --- a/src/WINNT/afsd/cm_vnodeops.c +++ b/src/WINNT/afsd/cm_vnodeops.c @@ -4268,8 +4268,8 @@ static void cm_LockRangeSubtract(cm_range_t * pos, const cm_range_t * neg) afs_int64 int_begin; afs_int64 int_end; - int_begin = MAX(pos->offset, neg->offset); - int_end = MIN(pos->offset+pos->length, neg->offset+neg->length); + int_begin = max(pos->offset, neg->offset); + int_end = min(pos->offset+pos->length, neg->offset+neg->length); if (int_begin < int_end) { if (int_begin == pos->offset) { -- 1.9.4