hpux-20021106

Minor fixes for HPUX110.

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index e6162e81f7231072c18237bae5c25b58edf6b920..45bf2878858ce54b65eb20796eaf1cca4529bc13 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -41,7 +41,9 @@ typedef unsigned short                  etap_event_t;
 #include "h/socketvar.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 /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */

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