Minor fixes for HPUX110.

(cherry picked from commit 63c5438e4864c80d8809ddd326ce09ccb80ee55f)

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 271d1058d8831719d6cf475a014450ef902e6b3a..4ac04c2c470dee286f59d9efc69438a792ae1a8f 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -37,7 +37,9 @@ typedef unsigned short                  etap_event_t;
 #include "../h/protosw.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
 #include "../h/domain.h"
+#if !defined(AFS_HPUX110_ENV)
 #include "../h/dir.h"
+#endif
 #include "../h/buf.h"
 #include "../h/mbuf.h"
 #else

diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c
index 4bf4009d430eb2dd2306e8f9ef928191b9cf1aaa..77feabeaf5211f97522384a1f6eec69d16086a3d 100644 (file)
--- a/src/util/afs_lhash.c
+++ b/src/util/afs_lhash.c
@@ -23,6 +23,10 @@ RCSID("$Header$");
 #define CHECK_INVARIANTS
 #endif /* KERNEL */
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 /* max hash table load factor */
 enum { LOAD_FACTOR = 5 };