Linux: Simplify header file checks

[openafs.git] / src / rx / rx_kcommon.h

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 51f0352..cabb289 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -94,17 +94,17 @@ typedef unsigned short etap_event_t;
 #include "netinet/in_systm.h"
 #endif
 #include "netinet/ip.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV)
 #include "netinet/in_pcb.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #ifndef AFS_LINUX22_ENV
-#if !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_DARWIN_ENV)
 #include "netinet/ip_var.h"
 #endif
 #include "netinet/ip_icmp.h"
 #endif /* AFS_LINUX22_ENV */
 #include "netinet/udp.h"
-#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
 #include "netinet/udp_var.h"
 #endif
 #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
@@ -112,7 +112,7 @@ typedef unsigned short etap_event_t;
 #endif
 #ifdef AFS_LINUX22_ENV
 #include "h/sched.h"
-#if defined(FREEZER_H_EXISTS)
+#if defined(HAVE_LINUX_FREEZER_H)
 #include "h/freezer.h"
 #endif
 #include "h/netdevice.h"
@@ -124,7 +124,7 @@ typedef unsigned short etap_event_t;
 #endif
 #include "net/if.h"
 #endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
 #include "netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV)
@@ -145,7 +145,6 @@ typedef unsigned short etap_event_t;
 #ifdef KERNEL
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "rx/rx_internal.h"
 #endif
 #if defined(AFS_OBSD_ENV)
 #include "afs/sysincludes.h"