git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
no-copy-libafs-builds-20021015
[openafs.git] / src / afs / sysincludes.h
diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 1806ad9..41a9b03 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -7,6 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#ifdef UKERNEL
+#include <UKERNEL/sysincludes.h>
+#else
+
 #ifndef __AFS_SYSINCLUDESH__
 #define __AFS_SYSINCLUDESH__ 1
 
@@ -84,24 +88,24 @@ typedef unsigned short                  etap_event_t;
 #endif
 #endif
 #if    !defined(AFS_OSF_ENV)
-#include "../h/errno.h"
-#include "../h/types.h"
-#include "../h/param.h"
+#include "h/errno.h"
+#include "h/types.h"
+#include "h/param.h"
 
 #ifdef AFS_AUX_ENV
 #ifdef PAGING
-#include "../h/mmu.h"
-#include "../h/seg.h"
-#include "../h/page.h"
-#include "../h/region.h"
+#include "h/mmu.h"
+#include "h/seg.h"
+#include "h/page.h"
+#include "h/region.h"
 #endif /* PAGING */
-#include "../h/sysmacros.h"
-#include "../h/signal.h"
-#include "../h/var.h"
+#include "h/sysmacros.h"
+#include "h/signal.h"
+#include "h/var.h"
 #endif /* AFS_AUX_ENV */
 
-#include "../h/systm.h"
-#include "../h/time.h"
+#include "h/systm.h"
+#include "h/time.h"
 
 #ifdef AFS_AIX_ENV
 #ifdef AFS_AIX41_ENV
@@ -119,18 +123,18 @@ typedef unsigned short                  etap_event_t;
 
 #if defined(AFS_SGI_ENV)
 #include "values.h"
-#include "../sys/sema.h"
-#include "../sys/cmn_err.h"
+#include "sys/sema.h"
+#include "sys/cmn_err.h"
 #ifdef AFS_SGI64_ENV
 #include <ksys/behavior.h>
 #endif /* AFS_SGI64_ENV */
-#include "../fs/efs_inode.h"
+#include "fs/efs_inode.h"
 #ifdef AFS_SGI_EFS_IOPS_ENV
-#include "../sgiefs/efs.h"
+#include "sgiefs/efs.h"
 #endif
-#include "../sys/kmem.h"
-#include "../sys/cred.h"
-#include "../sys/resource.h"
+#include "sys/kmem.h"
+#include "sys/cred.h"
+#include "sys/resource.h"
 
 /*
  * ../sys/debug.h defines ASSERT(), but it is nontrivial only if DEBUG
@@ -143,20 +147,20 @@ typedef unsigned short                  etap_event_t;
  */
 #if defined(AFS_SGI65_ENV) && !defined(DEBUG)
 #define DEBUG
-#include "../sys/debug.h"
+#include "sys/debug.h"
 #undef DEBUG
 #else
-#include "../sys/debug.h"
+#include "sys/debug.h"
 #endif
 
-#include "../sys/statvfs.h"
-#include "../sys/sysmacros.h"
-#include "../sys/fs_subr.h"
-#include "../sys/siginfo.h"
+#include "sys/statvfs.h"
+#include "sys/sysmacros.h"
+#include "sys/fs_subr.h"
+#include "sys/siginfo.h"
 #endif  /* AFS_SGI_ENV */
 
 #if !defined(AFS_AIX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_SGI_ENV)
-#  include "../h/kernel.h"
+#  include "h/kernel.h"
 #endif /* !SUN5 && !SGI */
 
 #ifdef AFS_SUN5_ENV
@@ -164,45 +168,45 @@ typedef unsigned short                  etap_event_t;
 #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 SUN56 socketvar.h warnings */
+#include "h/stropts.h" /* stops SUN56 socketvar.h warnings */
+#include "h/stream.h"  /* stops SUN56 socketvar.h errors */
 #endif
 
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/protosw.h"
+#include "h/socket.h"
+#include "h/socketvar.h"
+#include "h/protosw.h"
 
 #if defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_FBSD_ENV)
-#  include "../h/dirent.h"
+#  include "h/dirent.h"
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/sysmacros.h"
-#    include "../h/fs/ufs_fsdir.h"
+#    include "h/sysmacros.h"
+#    include "h/fs/ufs_fsdir.h"
 #  endif /* AFS_SUN5_ENV */
 #else
-#  include "../h/dir.h"
+#  include "h/dir.h"
 #endif /* SGI || SUN || HPUX */
 
 #ifdef AFS_DEC_ENV
-#  include "../h/smp_lock.h"
+#  include "h/smp_lock.h"
 #endif /* AFS_DEC_ENV */
 
 
 #if !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV)
-#include "../h/user.h"
+#include "h/user.h"
 #endif /* AFS_SGI64_ENV */
 #define        MACH_USER_API   1
-#include "../h/file.h"
-#include "../h/uio.h"
-#include "../h/buf.h"
-#include "../h/stat.h"
+#include "h/file.h"
+#include "h/uio.h"
+#include "h/buf.h"
+#include "h/stat.h"
 
 
 /* ----- The following mainly deal with vnodes/inodes stuff ------ */
 #ifdef AFS_DEC_ENV
-#  include "../h/mount.h"
-#  include "../machine/psl.h"
-#  include "../afs/gfs_vnode.h"
+#  include "h/mount.h"
+#  include "machine/psl.h"
+#  include "afs/gfs_vnode.h"
 #endif
 
 #ifdef AFS_MACH_ENV
@@ -218,12 +222,12 @@ typedef unsigned short                  etap_event_t;
 
 #ifndef AFS_DEC_ENV
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/statvfs.h"
+#    include "h/statvfs.h"
 #  endif /* AFS_SUN5_ENV */
 #  ifdef AFS_HPUX_ENV
 struct vfspage;                        /* for vnode.h compiler warnings */
-#    include "../h/swap.h"     /* for struct swpdbd, for vnode.h compiler warnings */
-#    include "../h/dbd.h"      /* for union idbd, for vnode.h compiler warnings */
+#    include "h/swap.h"        /* for struct swpdbd, for vnode.h compiler warnings */
+#    include "h/dbd.h" /* for union idbd, for vnode.h compiler warnings */
 #  endif /* AFS_HPUX_ENV */
 #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV)
 #  include <sys/uio.h>
@@ -253,16 +257,16 @@ MALLOC_DECLARE(M_AFS);
 #  include <ufs/ufs/inode.h>
 #  include <ufs/ffs/fs.h>
 #else
-#  include "../h/vfs.h"
-#  include "../h/vnode.h"
+#  include "h/vfs.h"
+#  include "h/vnode.h"
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/fs/ufs_inode.h"
-#    include "../h/fs/ufs_mount.h"
+#    include "h/fs/ufs_inode.h"
+#    include "h/fs/ufs_mount.h"
 #  else
 #    if !defined(AFS_SGI_ENV) && !defined(AFS_AIX32_ENV)
-#      include "../ufs/inode.h"
+#      include "ufs/inode.h"
 #      if !defined(AFS_SGI_ENV) && !defined(AFS_HPUX_ENV)
-#        include "../ufs/mount.h"
+#        include "ufs/mount.h"
 #      endif /* !AFS_HPUX_ENV */
 #    endif /* !AFS_AIX32_ENV */
 #  endif /* AFS_SUN5_ENV */
@@ -270,55 +274,55 @@ MALLOC_DECLARE(M_AFS);
 #endif /* AFS_DEC_ENV */
 
 /* These mainly deal with networking and rpc headers */
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #undef MFREE   /* defined at mount.h for AIX */
 #ifdef AFS_SUN5_ENV
-#  include "../h/time.h"
+#  include "h/time.h"
 #else
-#  include "../h/mbuf.h"
+#  include "h/mbuf.h"
 #endif /* AFS_SUN5_ENV */
 
-#include "../rpc/types.h"
-#include "../rx/xdr.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 
 #ifdef AFS_AIX32_ENV
 #  include "net/spl.h"
 #endif
 
 /* Miscellaneous headers */
-#include "../h/proc.h"
+#include "h/proc.h"
 #if !defined(AFS_FBSD_ENV)
-#include "../h/ioctl.h"
+#include "h/ioctl.h"
 #endif /* AFS_FBSD_ENV */
 
 #if    defined(AFS_HPUX101_ENV)
-#include "../h/proc_iface.h"
-#include "../h/vas.h"
+#include "h/proc_iface.h"
+#include "h/vas.h"
 #endif
 
 #if    defined(AFS_HPUX102_ENV)
-#include "../h/unistd.h"
-#include "../h/tty.h"
+#include "h/unistd.h"
+#include "h/tty.h"
 #endif
 
 #if !defined(AFS_SGI_ENV) && !defined(AFS_SUN_ENV) && !defined(AFS_MACH_ENV) && !defined(AFS_AIX32_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV)
 
-#  include "../h/text.h"
+#  include "h/text.h"
 #endif 
 
 
 #if    defined(AFS_AIX_ENV) || defined(AFS_DEC_ENV)
-#  include "../h/flock.h"      /* fcntl.h is a user-level include in aix */
+#  include "h/flock.h" /* fcntl.h is a user-level include in aix */
 #else
-#  include "../h/fcntl.h"
+#  include "h/fcntl.h"
 #endif /* AIX || DEC */
 
 #if defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
-#  include "../h/unistd.h"
+#  include "h/unistd.h"
 #endif /* SGI || SUN */
 
 #ifdef AFS_AIX32_ENV
-#  include "../h/vmuser.h"
+#  include "h/vmuser.h"
 #endif /* AFS_AIX32_ENV */
 
 #if    defined(AFS_SUN5_ENV)
@@ -383,3 +387,5 @@ MALLOC_DECLARE(M_AFS);
 #endif /* AFS_OBSD_ENV */
 
 #endif /* __AFS_SYSINCLUDESH__  so idempotent */
+
+#endif
OpenAFS Master Repository