coda-xfs-header-defines-fun-20050706

make this better, we should never have been doing it as we were before

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 33c049db662fc9a4947706eaaf9b0a00daef0114..587288c57de09900b1dc7fa9b8cfc29e131ecc84 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -74,13 +74,16 @@
  */
 #ifndef _LINUX_CODA_FS_I
 #define _LINUX_CODA_FS_I
-#endif
+#define _CODA_HEADER_
 #define _CFS_HEADER_
 struct coda_inode_info {
 };
+#endif
+#ifndef _LINUX_XFS_FS_I
 #define _LINUX_XFS_FS_I
 struct xfs_inode_info {
 };
+#endif
 #include <asm/uaccess.h>
 #include <linux/list.h>
 #include <linux/dcache.h>

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 30b49084360db196a6b95d8c1e80cd8de8f6bd46..4cc32966daf128a5eeb26ae742fc188a3a51be13 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -21,11 +21,11 @@
 #ifdef AFS_LINUX22_ENV
 #ifndef _LINUX_CODA_FS_I
 #define _LINUX_CODA_FS_I 1
-#endif
 #define _CODA_HEADER_ 1
 struct coda_inode_info {
 };
 #endif
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_