diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 16:27:00 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 16:27:00 +0200 |
| commit | a52e729f304c1edbd3842f837f4b2b11222bbc57 (patch) | |
| tree | a54bf8fdf90318ef19a27a3f0820d14ca594d771 | |
| parent | 1d0cda2f034c44e2274f90b5453e5b031446c034 (diff) | |
| download | samba-a52e729f304c1edbd3842f837f4b2b11222bbc57.tar.gz samba-a52e729f304c1edbd3842f837f4b2b11222bbc57.tar.bz2 samba-a52e729f304c1edbd3842f837f4b2b11222bbc57.zip | |
Move rbtree.[ch] to lib/util.
| -rw-r--r-- | lib/util/config.mk | 1 | ||||
| -rw-r--r-- | lib/util/rbtree.c (renamed from source3/lib/rbtree.c) | 0 | ||||
| -rw-r--r-- | lib/util/rbtree.h (renamed from source3/include/rbtree.h) | 0 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/lib/dbwrap_rbt.c | 2 | ||||
| -rw-r--r-- | source3/lib/memcache.c | 2 |
6 files changed, 4 insertions, 3 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk index 925713a53c..4918a4d063 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -23,6 +23,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ mutex.o \ idtree.o \ become_daemon.o \ + rbtree.o \ params.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ diff --git a/source3/lib/rbtree.c b/lib/util/rbtree.c index f6868cab5d..f6868cab5d 100644 --- a/source3/lib/rbtree.c +++ b/lib/util/rbtree.c diff --git a/source3/include/rbtree.h b/lib/util/rbtree.h index 1cfd3463a0..1cfd3463a0 100644 --- a/source3/include/rbtree.h +++ b/lib/util/rbtree.h diff --git a/source3/Makefile.in b/source3/Makefile.in index e58d3ba73d..b5328400ba 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -312,7 +312,7 @@ LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \ lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \ lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \ - lib/interfaces.o lib/rbtree.o lib/memcache.o \ + lib/interfaces.o ../lib/util/rbtree.o lib/memcache.o \ lib/util_transfer_file.o lib/async_req.o \ lib/async_sock.o \ $(TDB_LIB_OBJ) \ diff --git a/source3/lib/dbwrap_rbt.c b/source3/lib/dbwrap_rbt.c index b70ce3dfa0..6e09627223 100644 --- a/source3/lib/dbwrap_rbt.c +++ b/source3/lib/dbwrap_rbt.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "rbtree.h" +#include "../lib/util/rbtree.h" #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15) diff --git a/source3/lib/memcache.c b/source3/lib/memcache.c index e1426bc811..9c892fedfa 100644 --- a/source3/lib/memcache.c +++ b/source3/lib/memcache.c @@ -18,7 +18,7 @@ */ #include "memcache.h" -#include "rbtree.h" +#include "../lib/util/rbtree.h" static struct memcache *global_cache; |