Module Name: src
Committed By: tron
Date: Wed Nov 17 13:19:32 UTC 2010
Modified Files:
src/common/lib/libc/gen: rb.c
src/lib/libc/include: namespace.h
Log Message:
Provide proper namespace protection for rbtree(3) because it is now
used by "libc" internally.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/gen/rb.c
cvs rdiff -u -r1.144 -r1.145 src/lib/libc/include/namespace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/rb.c
diff -u src/common/lib/libc/gen/rb.c:1.8 src/common/lib/libc/gen/rb.c:1.9
--- src/common/lib/libc/gen/rb.c:1.8 Sat Sep 25 01:42:38 2010
+++ src/common/lib/libc/gen/rb.c Wed Nov 17 13:19:32 2010
@@ -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
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.144 src/lib/libc/include/namespace.h:1.145
--- src/lib/libc/include/namespace.h:1.144 Sat Nov 13 19:41:32 2010
+++ src/lib/libc/include/namespace.h Wed Nov 17 13:19:32 2010
@@ -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
