From e1f253517b2b4bdfe5eef814ec026083bfcf644a Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 5 Jul 2005 23:46:12 +0000 Subject: [PATCH] Branch b1_4 Fix catamount build breakage, may be able to remove entirely at some point. b=6923 --- lnet/include/libcfs/linux/libcfs.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lnet/include/libcfs/linux/libcfs.h b/lnet/include/libcfs/linux/libcfs.h index 208b89e..1e82343 100644 --- a/lnet/include/libcfs/linux/libcfs.h +++ b/lnet/include/libcfs/linux/libcfs.h @@ -17,7 +17,19 @@ #ifdef HAVE_ASM_TYPES_H #include #else -#include "types.h" +/* this is actually coming from within lustre, a layering violation. + * we may not even need it, as libuptlctl (the dependency for which it + * is needed in liblustre building on catamount, bug 6923) shows no + * apparent need to be included in liblustre AFAICS. The change of + * include to lustre/types.h only makes this explicit instead of implicit. + * To be resolved. For now, make it CRAY_PORTALS only, to avoid breaking + * non-b1_4 branches that don't have this file. + */ +# if CRAY_PORTALS +# include +# else +# include "types.h" +# endif #endif -- 1.8.3.1