From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 30 Oct 2002 07:03:05 +0000 (+0000)
Subject: lhash-includes-cleanup-20021027
X-Git-Tag: openafs-devel-1_3_50~534
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=76b9b951749ae333d56a3b66dd09f01e23e42903;p=packages%2Fo%2Fopenafs.git

lhash-includes-cleanup-20021027


make stddef be included when building ukernel so NULL is defined
cleanup redundancy
---

diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c
index 10d2d2057..4f3bbbde7 100644
--- a/src/util/afs_lhash.c
+++ b/src/util/afs_lhash.c
@@ -12,16 +12,13 @@
 
 RCSID("$Header$");
 
-#ifdef KERNEL
-#include "afs_atomlist.h"
-#include "afs_lhash.h"
-#else /* KERNEL */
 #include "afs_atomlist.h"
 #include "afs_lhash.h"
+#ifndef KERNEL
 /* for now, only turn on assertions in user-space code */
 #include <assert.h>
 #define CHECK_INVARIANTS
-#endif /* KERNEL */
+#endif /* !KERNEL */
 
 /* max hash table load factor */
 enum { LOAD_FACTOR = 5 };
diff --git a/src/util/afs_lhash.h b/src/util/afs_lhash.h
index 911c29a8f..e52547756 100644
--- a/src/util/afs_lhash.h
+++ b/src/util/afs_lhash.h
@@ -28,7 +28,7 @@
 #ifndef AFS_LHASH_H
 #define AFS_LHASH_H
 
-#ifndef KERNEL
+#if !defined(KERNEL) || defined(UKERNEL)
 #include <stddef.h>
 #endif