Fix build for FreeBSD 10.0

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

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index b4db3b2..3e3a172 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -52,6 +52,9 @@
 # include <sys/timeout.h>
 
 #elif defined(AFS_NBSD40_ENV)
+# ifdef AFS_NBSD50_ENV
+#  include <sys/simplelock.h>
+# endif
 # include <sys/errno.h>
 # include <sys/types.h>
 # include <sys/mount.h> /* may define MOUNT_AFS */
@@ -82,21 +85,14 @@
 # include <sys/socket.h>
 # include <sys/socketvar.h>
 # include <sys/dirent.h>
-# include <sys/user.h>
 # include <sys/kauth.h>
 # include <sys/uio.h>
 # include <sys/buf.h>
 # include <sys/stat.h>
 # include <sys/file.h>
 # include <sys/namei.h>
-# include <sys/socket.h>
-# include <sys/socketvar.h>
-# include <sys/dirent.h>
-# include <sys/user.h>
-# include <sys/kauth.h>
 # include <sys/uio.h>
 # include <sys/buf.h>
-# include <sys/stat.h>
 # include <sys/file.h>
 # include <sys/namei.h>
 # include <sys/vnode.h>
@@ -106,9 +102,7 @@
 # include <ufs/ufs/extattr.h>
 # include <ufs/ufs/ufsmount.h>
 # ifndef MLEN
-#  if 0
-#   include <sys/mbuf.h>
-#  endif /* 0 */
+#  include <sys/mbuf.h>
 #  include <net/if.h>
 # endif /* !MLEN */
 # include <sys/protosw.h>
@@ -135,16 +129,6 @@
 #   include <linux/security.h>
 #  endif
 #  include <linux/suspend.h>
-#  if defined(LINUX_KEYRING_SUPPORT)
-#   include <linux/rwsem.h>
-#   include <linux/key.h>
-#   if defined(HAVE_LINUX_KEY_TYPE_H)
-#    include <linux/key-type.h>
-#   endif
-#   ifndef KEY_ALLOC_IN_QUOTA
-#    define KEY_ALLOC_IN_QUOTA 1
-#   endif
-#  endif
 # endif
 /* Avoid conflicts with coda overloading AFS type namespace. Must precede
  * inclusion of uaccess.h.
@@ -170,6 +154,7 @@ struct xfs_inode_info {
 # include <linux/sched.h>
 # include <linux/mm.h>
 # include <linux/slab.h>
+# include <linux/proc_fs.h>
 # include <linux/string.h>
 # if defined(HAVE_LINUX_SEMAPHORE_H)
 #  include <linux/semaphore.h>
@@ -186,6 +171,9 @@ struct xfs_inode_info {
 # if defined(HAVE_LINUX_EXPORTFS_H)
 #  include <linux/exportfs.h>
 # endif
+# ifdef AFS_LINUX24_ENV
+#  include <linux/pagemap.h>
+# endif
 
 #else /* AFS_LINUX22_ENV */
 # if defined(AFS_DARWIN_ENV)
@@ -276,12 +264,9 @@ typedef unsigned short etap_event_t;
 
 # ifdef        AFS_SUN5_ENV
 #  include <sys/cmn_err.h>     /* for kernel printf() prototype */
-# endif
-
-# if   defined(AFS_SUN56_ENV)
-#  include "h/vfs.h"           /* stops SUN56 socketvar.h warnings */
-#  include "h/stropts.h"               /* stops SUN56 socketvar.h warnings */
-#  include "h/stream.h"                /* stops SUN56 socketvar.h errors */
+#  include "h/vfs.h"           /* stops SUN5 socketvar.h warnings */
+#  include "h/stropts.h"               /* stops SUN5 socketvar.h warnings */
+#  include "h/stream.h"                /* stops SUN5 socketvar.h errors */
 # endif
 
 # ifdef AFS_SUN510_ENV
@@ -294,7 +279,7 @@ typedef unsigned short etap_event_t;
 # include "h/protosw.h"
 
 # if defined(AFS_FBSD_ENV)
-#  include "limits.h"
+#  include "sys/limits.h"
 # endif
 
 # ifdef AFS_HPUX_ENV