Linux: Simplify header file checks

[openafs.git] / src / afs / sysincludes.h

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index b914956..0daeca6 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -53,7 +53,7 @@
 
 #elif defined(AFS_LINUX22_ENV)
 # include <linux/version.h>
-# ifdef CONFIG_H_EXISTS
+# ifdef HAVE_LINUX_CONFIG_H
 #  include <linux/config.h>
 # endif
 # include <linux/linkage.h>
@@ -75,7 +75,7 @@
 #  if defined(LINUX_KEYRING_SUPPORT)
 #   include <linux/rwsem.h>
 #   include <linux/key.h>
-#   if defined(KEY_TYPE_H_EXISTS)
+#   if defined(HAVE_LINUX_KEY_TYPE_H)
 #    include <linux/key-type.h>
 #   endif
 #   ifndef KEY_ALLOC_IN_QUOTA
@@ -108,7 +108,7 @@ struct xfs_inode_info {
 # include <linux/mm.h>
 # include <linux/slab.h>
 # include <linux/string.h>
-# if defined(LINUX_SEMAPHORE_H)
+# if defined(HAVE_LINUX_SEMAPHORE_H)
 #  include <linux/semaphore.h>
 # else
 #  include <asm/semaphore.h>
@@ -117,7 +117,7 @@ struct xfs_inode_info {
 #  include <linux/mutex.h>
 # endif
 # include <linux/errno.h>
-# ifdef COMPLETION_H_EXISTS
+# ifdef HAVE_LINUX_COMPLETION_H
 #  include <linux/completion.h>
 # endif
 # if defined(LINUX_USE_FH)
@@ -230,6 +230,10 @@ typedef unsigned short etap_event_t;
 # include "h/socketvar.h"
 # include "h/protosw.h"
 
+# if defined(AFS_FBSD_ENV)
+#  include "limits.h"
+# endif
+
 # if defined(AFS_SGI_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_FBSD_ENV)
 #  include "h/dirent.h"
 #  ifdef       AFS_SUN5_ENV