linux-ifdef-stupidity-cleanup-20030117

as pointed out by zacheiss@mit.edu

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index fa4a4bd03ea77afa05968a79846e37258e21ccd5..9be2804c5d1ebb77a568d2e2f58181335ceea6ff 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -450,7 +450,7 @@ afs_int32 PagInCred(const struct AFS_UCRED *cred)
     }
 #endif
 #else
-#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV)
     if (cred->cr_ngroups < 2) return NOPAG;
 #endif
 #endif

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 267f849bd60e92cff38d0a3e87e6c4a061ab7db4..09c16f00b1b24ea962ac1427b498ef9961e3aaf3 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -444,7 +444,7 @@ extern void osi_iput(struct inode *ip);
 extern void afs_osi_SetTime(osi_timeval_t *atv);
 
 /* LINUX/osi_misc.c */
-#ifdef AFS_LINUX_ENV
+#ifdef AFS_LINUX20_ENV
 #ifdef AFS_LINUX24_ENV
 extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink,
                vnode_t **dirvpp, struct dentry **dpp);

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index f9a6ab83929d694452ac65787dd5a0a98af6efaa..c75912298bf4c9d8d00ca387533293f5c9c2250d 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -1524,7 +1524,7 @@ void rxi_SendPacket(struct rx_call * call, struct rx_connection * conn,
          p->retryTime = p->timeSent;  /* resend it very soon */
          clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8));
 
-#if defined(KERNEL) && defined(AFS_LINUX_ENV)
+#if defined(KERNEL) && defined(AFS_LINUX20_ENV)
          /* Linux is nice -- it can tell us right away that we cannot
           * reach this recipient by returning an ENETUNREACH error
           * code.  So, when this happens let's "down" the host NOW so
@@ -1698,7 +1698,7 @@ void rxi_SendPacketList(struct rx_call * call, struct rx_connection * conn,
            p->retryTime = p->timeSent;  /* resend it very soon */
            clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8));
          }
-#if defined(KERNEL) && defined(AFS_LINUX_ENV)
+#if defined(KERNEL) && defined(AFS_LINUX20_ENV)
          /* Linux is nice -- it can tell us right away that we cannot
           * reach this recipient by returning an ENETUNREACH error
           * code.  So, when this happens let's "down" the host NOW so