Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide proper namespace protection for rbtree(3) because it is now 

used by "libc" internally.
This commit is contained in:
tron 2010-11-17 13:19:32 +00:00
parent fe04c71aa0
commit aacd5349be
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib/libc/gen/rb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rb.c,v 1.8 2010/09/25 01:42:38 matt Exp $ */
/* $NetBSD: rb.c,v 1.9 2010/11/17 13:19:32 tron Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -56,17 +56,7 @@ __weak_alias(rb_tree_check, _rb_tree_check)
__weak_alias(rb_tree_depths, _rb_tree_depths)
#endif
#define rb_tree_init _rb_tree_init
#define rb_tree_find_node _rb_tree_find_node
#define rb_tree_find_node_geq _rb_tree_find_node_geq
#define rb_tree_find_node_leq _rb_tree_find_node_leq
#define rb_tree_insert_node _rb_tree_insert_node
#define rb_tree_remove_node _rb_tree_remove_node
#define rb_tree_iterate _rb_tree_iterate
#ifdef RBDEBUG
#define rb_tree_check _rb_tree_check
#define rb_tree_depths _rb_tree_depths
#endif
#include "namespace.h"
#endif
#ifdef RBTEST

15
lib/libc/include/namespace.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: namespace.h,v 1.144 2010/11/13 19:41:32 christos Exp $ */
/* $NetBSD: namespace.h,v 1.145 2010/11/17 13:19:32 tron Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@ -805,6 +805,19 @@
#define dladdr __dladdr
#define fmtcheck __fmtcheck
/* RB trees */
#define rb_tree_init _rb_tree_init
#define rb_tree_find_node _rb_tree_find_node
#define rb_tree_find_node_geq _rb_tree_find_node_geq
#define rb_tree_find_node_leq _rb_tree_find_node_leq
#define rb_tree_insert_node _rb_tree_insert_node
#define rb_tree_remove_node _rb_tree_remove_node
#define rb_tree_iterate _rb_tree_iterate
#ifdef RBDEBUG
#define rb_tree_check _rb_tree_check
#define rb_tree_depths _rb_tree_depths
#endif
/* rpc locks */
#define authdes_lock __rpc_authdes_lock
#define authnone_lock __rpc_authnone_lock