- try to pull out NSPRisms where they're not needed

1 files changed, 16 insertions, 14 deletions

diff --git a/src/map.h b/src/map.h
index 6775ccc..9577997 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,30 +1,32 @@
+#include <rpc/xdr.h>
+
 struct plugin_state;
 struct slapi_pblock;
 /* Functions to pull data out of maps. */
 int map_startup(struct plugin_state *state);
 int map_init(struct slapi_pblock *pb, struct plugin_state *state);
 int map_master_name(struct plugin_state *state, const char **master);
-PRBool map_supports_domain(struct plugin_state *state,
+bool_t map_supports_domain(struct plugin_state *state,
 			   const char *domain,
-			   PRBool *supported);
-PRBool map_supports_map(struct plugin_state *state,
+			   bool_t *supported);
+bool_t map_supports_map(struct plugin_state *state,
 			const char *domain,
 			const char *map,
-			PRBool *supported);
-PRBool map_match(struct plugin_state *state,
+			bool_t *supported);
+bool_t map_match(struct plugin_state *state,
 		 const char *domain, const char *map,
 		 unsigned int key_len, char *key,
 		 unsigned int *value_len, char **value);
-PRBool map_first(struct plugin_state *state,
+bool_t map_first(struct plugin_state *state,
 		 const char *domain, const char *map,
 		 unsigned int *first_key_len, char **first_key,
 		 unsigned int *first_value_len, char **first_value);
-PRBool map_next(struct plugin_state *state,
+bool_t map_next(struct plugin_state *state,
 		const char *domain, const char *map,
 		unsigned int prev_len, const char *prev,
 		unsigned int *next_key_len, char **next_key,
 		unsigned int *next_value_len, char **next_value);
-PRBool map_order(struct plugin_state *state,
+bool_t map_order(struct plugin_state *state,
 		 const char *domain, const char *map,
 		 unsigned int *order);
 /* Functions to push data into maps. */
@@ -46,8 +48,8 @@ void map_data_set_entry(struct plugin_state *state,
 			const char *id, const char **related_ids,
 			unsigned int key_len, char *key,
 			unsigned int value_len, char *value);
-PRBool map_data_foreach_entry_id(struct plugin_state *state, const char *id,
-				 PRBool (*fn)(const char *domain,
+bool_t map_data_foreach_entry_id(struct plugin_state *state, const char *id,
+				 bool_t (*fn)(const char *domain,
 					      const char *map,
 					      const char *key,
 					      unsigned int key_len,
@@ -55,9 +57,9 @@ PRBool map_data_foreach_entry_id(struct plugin_state *state, const char *id,
 					      unsigned int value_len,
 					      const char *id, void *cbdata),
 				 void *cbdata);
-PRBool map_data_foreach_entry_related_id(struct plugin_state *state,
+bool_t map_data_foreach_entry_related_id(struct plugin_state *state,
 					 const char *related_id,
-					 PRBool (*fn)(const char *domain,
+					 bool_t (*fn)(const char *domain,
 						      const char *map,
 						      const char *key,
 						      unsigned int key_len,
@@ -66,8 +68,8 @@ PRBool map_data_foreach_entry_related_id(struct plugin_state *state,
 						      const char *id,
 						      void *cbdata),
 					 void *cbdata);
-PRBool map_data_foreach_map(struct plugin_state *state, const char *domain_name,
-			    PRBool (*fn)(const char *domain,
+bool_t map_data_foreach_map(struct plugin_state *state, const char *domain_name,
+			    bool_t (*fn)(const char *domain,
 			   		 const char *map,
 					 void *backend_data,
 					 void *cbdata),