rx-glock-order-headers-correctly-so-its-defined-or-not-consistently-20020322

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

diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h
index 2c6b216..2c96eba 100644 (file)
--- a/src/afs/afsincludes.h
+++ b/src/afs/afsincludes.h
@@ -1,8 +1,14 @@
 /*
- * (C) COPYRIGHT IBM CORPORATION 1987, 1988
- * LICENSED MATERIALS - PROPERTY OF IBM
+ * 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
  */
 
+#include <afsconfig.h>
+
 /* AFS based headers */
 #include "../afs/stds.h"
 #ifdef AFS_AIX_ENV
@@ -20,8 +26,8 @@
 #if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)
 #include "../afs/osi_vfs.h"
 #endif
-#include "../afs/afs_osi.h"
 #include "../rx/rx.h"
+#include "../afs/afs_osi.h"
 #include "../afs/lock.h"
 #include "../afs/volerrors.h"
 #include "../afs/voldefs.h"
@@ -47,6 +53,6 @@
 #include "../afs/afs_axscache.h"
 #include "../afs/icl.h"
 #include "../afs/afs_prototypes.h"
-#ifdef AFS_LINUX20_ENV
+#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
 #include "../afs/osi_machdep.h"
 #endif