From 5684b7ef41ca009657cd8cbf4ea4c652e618f304 Mon Sep 17 00:00:00 2001
From: zhengshuxin <zhengshuxin@gmail.com>
Date: Fri, 21 Apr 2017 15:57:51 +0800
Subject: [PATCH] rename boolean_t to acl_boolean_t for avoiding collision with
 xcode's lib

---
 lib_acl/include/stdlib/avl.h      | 8 ++++----
 lib_acl/include/stdlib/avl_impl.h | 2 +-
 lib_acl/src/stdlib/common/avl.c   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib_acl/include/stdlib/avl.h b/lib_acl/include/stdlib/avl.h
index 24281366d..c62eeb66e 100644
--- a/lib_acl/include/stdlib/avl.h
+++ b/lib_acl/include/stdlib/avl.h
@@ -262,9 +262,9 @@ ACL_API void avl_remove(avl_tree_t *tree, void *node);
  * avl_update_gt() only if you know the direction in which the order of the
  * node may change.
  */
-ACL_API boolean_t avl_update(avl_tree_t *, void *);
-ACL_API boolean_t avl_update_lt(avl_tree_t *, void *);
-ACL_API boolean_t avl_update_gt(avl_tree_t *, void *);
+ACL_API acl_boolean_t avl_update(avl_tree_t *, void *);
+ACL_API acl_boolean_t avl_update_lt(avl_tree_t *, void *);
+ACL_API acl_boolean_t avl_update_gt(avl_tree_t *, void *);
 
 /*
  * Return the number of nodes in the tree
@@ -274,7 +274,7 @@ ACL_API ulong_t avl_numnodes(avl_tree_t *tree);
 /*
  * Return B_TRUE if there are zero nodes in the tree, B_FALSE otherwise.
  */
-ACL_API boolean_t avl_is_empty(avl_tree_t *tree);
+ACL_API acl_boolean_t avl_is_empty(avl_tree_t *tree);
 
 /*
  * Used to destroy any remaining nodes in a tree. The cookie argument should
diff --git a/lib_acl/include/stdlib/avl_impl.h b/lib_acl/include/stdlib/avl_impl.h
index 52aff50d5..8ce894973 100644
--- a/lib_acl/include/stdlib/avl_impl.h
+++ b/lib_acl/include/stdlib/avl_impl.h
@@ -57,7 +57,7 @@ typedef unsigned int uintptr_t;
 
 #ifndef	SUNOS5
 typedef unsigned int ulong_t;
-typedef char boolean_t;
+typedef char acl_boolean_t;
 #endif
 
 #define B_FALSE		0
diff --git a/lib_acl/src/stdlib/common/avl.c b/lib_acl/src/stdlib/common/avl.c
index c9f52bd53..e29d1a739 100644
--- a/lib_acl/src/stdlib/common/avl.c
+++ b/lib_acl/src/stdlib/common/avl.c
@@ -821,7 +821,7 @@ avl_remove(avl_tree_t *tree, void *data)
 	avl_remove((tree), (obj));	\
 	avl_add((tree), (obj))
 
-boolean_t
+acl_boolean_t
 avl_update_lt(avl_tree_t *t, void *obj)
 {
 	void *neighbor;
@@ -838,7 +838,7 @@ avl_update_lt(avl_tree_t *t, void *obj)
 	return (B_FALSE);
 }
 
-boolean_t
+acl_boolean_t
 avl_update_gt(avl_tree_t *t, void *obj)
 {
 	void *neighbor;
@@ -855,7 +855,7 @@ avl_update_gt(avl_tree_t *t, void *obj)
 	return (B_FALSE);
 }
 
-boolean_t
+acl_boolean_t
 avl_update(avl_tree_t *t, void *obj)
 {
 	void *neighbor;
@@ -920,7 +920,7 @@ avl_numnodes(avl_tree_t *tree)
 	return (tree->avl_numnodes);
 }
 
-boolean_t
+acl_boolean_t
 avl_is_empty(avl_tree_t *tree)
 {
 	ASSERT(tree);