4 files changed, 15 insertions, 7 deletions
diff --git a/usr/src/lib/libpool/common/pool.c b/usr/src/lib/libpool/common/pool.c
index bcd8c9a..6031113 100644
--- a/usr/src/lib/libpool/common/pool.c
+++ b/usr/src/lib/libpool/common/pool.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,7 +34,6 @@
 #include <unistd.h>
 #include <stropts.h>
 #include <fcntl.h>
-#include <note.h>
 #include <errno.h>
 #include <ctype.h>
 #include <libintl.h>
@@ -923,7 +920,7 @@ pool_put_property(pool_conf_t *conf, pool_elem_t *pe, const char *name,
 
 	if (TO_CONF(pe) != conf) {
 		pool_seterror(POE_BADPARAM);
-		return (NULL);
+		return (0);
 	}
 
 	/* Don't allow (re)setting of the "temporary" property */
@@ -1103,7 +1100,7 @@ pool_rm_property(pool_conf_t *conf, pool_elem_t *pe, const char *name)
 
 	if (TO_CONF(pe) != conf) {
 		pool_seterror(POE_BADPARAM);
-		return (NULL);
+		return (0);
 	}
 
 	/* Don't allow removal of the "temporary" property */
diff --git a/usr/src/lib/libpool/common/pool_commit.c b/usr/src/lib/libpool/common/pool_commit.c
index b996524..fda0ec7 100644
--- a/usr/src/lib/libpool/common/pool_commit.c
+++ b/usr/src/lib/libpool/common/pool_commit.c
@@ -77,8 +77,14 @@
 #include "pool_internal.h"
 #include "pool_impl.h"
 
+#ifndef MIN
 #define	MIN(x, y) ((x) < (y) ? (x) : (y))
+#endif
+
+#ifndef MAX
 #define	MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+
 #define	POA_IMPORTANCE_NUM	0
 #define	POA_SURPLUS_TO_DEFAULT_NUM	1
 
diff --git a/usr/src/lib/libpool/common/pool_internal.h b/usr/src/lib/libpool/common/pool_internal.h
index e172d23..19a2855 100644
--- a/usr/src/lib/libpool/common/pool_internal.h
+++ b/usr/src/lib/libpool/common/pool_internal.h
@@ -137,7 +137,7 @@ typedef struct char_buf
  * Initialize a pool_value_t
  */
 #define	POOL_VALUE_INITIALIZER	/* = DEFAULT POOL VALUE */	\
-	{POC_INVAL, NULL, NULL }
+	{POC_INVAL, NULL, 0 }
 
 struct pool_value {
 	pool_value_class_t	pv_class;		/* Value type */
diff --git a/usr/src/lib/libpool/common/pool_xml.c b/usr/src/lib/libpool/common/pool_xml.c
index 4f0b6df..c696cbf 100644
--- a/usr/src/lib/libpool/common/pool_xml.c
+++ b/usr/src/lib/libpool/common/pool_xml.c
@@ -131,7 +131,12 @@ static const char *data_type_tags[] = {
 	"string"
 };
 
-const char *dtd_location = "file:///usr/share/lib/xml/dtd/rm_pool.dtd.1";
+#ifndef LIBPOOL_DTD_DIR
+# warning LIBPOOL_DTD_DIR is not defined, using default
+# define LIBPOOL_DTD_DIR "/usr/share/lib/xml/dtd"
+#endif
+
+const char *dtd_location = "file://" LIBPOOL_DTD_DIR "/rm_pool.dtd.1";
 
 static elem_type_tbl_t elem_tbl[ELEM_TYPE_COUNT] = {0};