From 25d696ebcada79e1569cb364dd3a6548ed19e695 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 23 Aug 2001 18:26:43 +0000 Subject: [PATCH] linux-kernel-headers-have-conflicting-min-max-defs-20010823 so we cheat and call our macros something else. based on report by Owen LeBlanc --- src/afs/afs_server.c | 10 +++++----- src/rxkad/rxkad_common.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 7ce9d8887..c148ee4b6 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -968,8 +968,8 @@ typedef struct ill_s { /**/ #endif #ifdef AFS_USERSPACE_IP_ADDR -#ifndef min -#define min(A,B) ((A)<(B)) ? (A) : (B) +#ifndef afs_min +#define afs_min(A,B) ((A)<(B)) ? (A) : (B) #endif /* * The IP addresses and ranks are determined by afsd (in user space) and @@ -1000,12 +1000,12 @@ afsi_SetServerIPRank(sa, addr, subnetmask) if ( (serverAddr & netMask ) == myNet ) { if ( (serverAddr & subnetmask ) == mySubnet) { if ( serverAddr == myAddr ) { /* same machine */ - sa->sa_iprank = min(sa->sa_iprank, TOPR); + sa->sa_iprank = afs_min(sa->sa_iprank, TOPR); } else { /* same subnet */ - sa->sa_iprank = min(sa->sa_iprank, HI); + sa->sa_iprank = afs_min(sa->sa_iprank, HI); } } else { /* same net */ - sa->sa_iprank = min(sa->sa_iprank, MED); + sa->sa_iprank = afs_min(sa->sa_iprank, MED); } } } diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 31c657989..1ce045d48 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -59,9 +59,9 @@ RCSID("$Header$"); char *rxi_Alloc(); -#ifndef max -#define max(a,b) ((a) < (b)? (b) : (a)) -#endif /* max */ +#ifndef afs_max +#define afs_max(a,b) ((a) < (b)? (b) : (a)) +#endif /* afs_max */ #ifndef KERNEL #define osi_Time() time(0) @@ -452,7 +452,7 @@ rxs_return_t rxkad_PreparePacket (aobj, acall, apacket) switch (level) { case rxkad_clear: return 0; /* shouldn't happen */ case rxkad_auth: - nlen = max (ENCRYPTIONBLOCKSIZE, + nlen = afs_max (ENCRYPTIONBLOCKSIZE, len + rx_GetSecurityHeaderSize(tconn)); if (nlen > (len + rx_GetSecurityHeaderSize(tconn))) { rxi_RoundUpPacket(apacket, nlen - (len + rx_GetSecurityHeaderSize(tconn))); -- 2.39.5