linux-kernel-headers-have-conflicting-min-max-defs-20010823

so we cheat and call our macros something else.
based on report by Owen LeBlanc <LeBlanc@mcc.ac.uk>

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 7ce9d8887c11ecb6562ef7fb87312dafdf896e22..c148ee4b6fa1042f420a6e0fbd8cded49669917b 100644 (file)
--- 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 31c6579897df742bc77ab45c2c6ea31adcf92b3c..1ce045d480cd926fcd6c605d4284ed87880006b7 100644 (file)
--- 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)));