From 601d291af6ee650037e41ebdba37e55238a97df0 Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Mon, 17 Feb 2003 18:43:43 +0000
Subject: [PATCH] merge b_devel into b_setattr.  highlights: - kernel 2.5 and
 liblustre build changes - fixes to Makefile.am for 7.3-era versions of
 automake, which is quite possibly   the worst piece of software with which I
 come in contact on a daily basis - small unlink fix

---
 lustre/obdclass/uuid.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index 0e279fb..fed9a8f 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -10,10 +10,14 @@
  * Library General Public License.
  * %End-Header%
  */
+#define DEBUG_SUBSYSTEM S_CLASS
+
+#ifdef __KERNEL__
 #include <linux/ctype.h>
 #include <linux/kernel.h>
-
-#define DEBUG_SUBSYSTEM S_CLASS
+#else 
+#include <liblustre.h>
+#endif
 
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
-- 
1.8.3.1