[src/trunk]: src Provide proper namespace protection for rbtree(3) because it...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5af77f65536a
branches:  trunk
changeset: 758832:5af77f65536a
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Nov 17 13:19:32 2010 +0000

description:
Provide proper namespace protection for rbtree(3) because it is now
used by "libc" internally.

diffstat:

 common/lib/libc/gen/rb.c     |  14 ++------------
 lib/libc/include/namespace.h |  15 ++++++++++++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diffs (57 lines):

diff -r d2c1580f2f33 -r 5af77f65536a common/lib/libc/gen/rb.c
--- a/common/lib/libc/gen/rb.c  Wed Nov 17 12:09:34 2010 +0000
+++ b/common/lib/libc/gen/rb.c  Wed Nov 17 13:19:32 2010 +0000
@@ -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_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
diff -r d2c1580f2f33 -r 5af77f65536a lib/libc/include/namespace.h
--- a/lib/libc/include/namespace.h      Wed Nov 17 12:09:34 2010 +0000
+++ b/lib/libc/include/namespace.h      Wed Nov 17 13:19:32 2010 +0000
@@ -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