From: Michael Meffie <mmeffie@sinenomine.net>
Date: Thu, 16 Aug 2012 22:04:22 +0000 (-0400)
Subject: vos: use the roken max macro
X-Git-Tag: upstream/1.8.0_pre1^2~2086
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bf1131fd33e71a18a0aef1cb21038144286fd28a;p=packages%2Fo%2Fopenafs.git

vos: use the roken max macro

Use the max macro provided by roken. Fixes builds on
solaris.

Change-Id: Id429fe816284a1017082054e02a830a2a952c26b
Reviewed-on: http://gerrit.openafs.org/8004
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index c79d1e961..9f4bfdf09 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -762,10 +762,10 @@ UV_CreateVolume3(afs_uint32 aserver, afs_int32 apart, char *aname,
     /* If caller specified RW id, but not RO/BK ids, have them be RW+1 and RW+2 */
     lastid = *anewid;
     if (aroid && *aroid != 0) {
-	lastid = MAX(lastid, *aroid);
+	lastid = max(lastid, *aroid);
     }
     if (abkid && *abkid != 0) {
-	lastid = MAX(lastid, *abkid);
+	lastid = max(lastid, *abkid);
     }
     if (aroid && *aroid == 0) {
 	*aroid = ++lastid;