test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-02 20:08:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename boolean_t to acl_boolean_t for avoiding collision with xcode's lib

Browse Source
This commit is contained in:
zhengshuxin 2017-04-21 15:57:51 +08:00
parent 5d19443275
commit 5684b7ef41
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib_acl/include/stdlib/avl.h
View File

@ -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

2
lib_acl/include/stdlib/avl_impl.h
View File

@ -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

8
lib_acl/src/stdlib/common/avl.c
View File

@ -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);