diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 17:27:30 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 17:27:30 +0200 |
| commit | cf659fa4fe7369ac58ef547f744c0ff3f9fb137a (patch) | |
| tree | 77a1882207359f92360abf0d524eef3c252f9ab4 | |
| parent | db65c3374ad337135a7bd4d67abced258c01c5bd (diff) | |
| download | samba-cf659fa4fe7369ac58ef547f744c0ff3f9fb137a.tar.gz samba-cf659fa4fe7369ac58ef547f744c0ff3f9fb137a.tar.bz2 samba-cf659fa4fe7369ac58ef547f744c0ff3f9fb137a.zip | |
Import talloc_stack into util library.
| -rw-r--r-- | lib/util/config.mk | 1 | ||||
| -rw-r--r-- | lib/util/talloc_stack.c (renamed from source3/lib/talloc_stack.c) | 0 | ||||
| -rw-r--r-- | lib/util/talloc_stack.h (renamed from source3/include/talloc_stack.h) | 0 | ||||
| -rw-r--r-- | lib/util/util.h | 1 | ||||
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
6 files changed, 5 insertions, 3 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk index 5488534f26..0eaabbf86b 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -26,6 +26,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ idtree.o \ become_daemon.o \ rbtree.o \ + talloc_stack.o \ params.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ diff --git a/source3/lib/talloc_stack.c b/lib/util/talloc_stack.c index 2722fb9676..2722fb9676 100644 --- a/source3/lib/talloc_stack.c +++ b/lib/util/talloc_stack.c diff --git a/source3/include/talloc_stack.h b/lib/util/talloc_stack.h index bb22b8a029..bb22b8a029 100644 --- a/source3/include/talloc_stack.h +++ b/lib/util/talloc_stack.h diff --git a/lib/util/util.h b/lib/util/util.h index fc651d58af..e72df023a9 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -44,6 +44,7 @@ extern const char *panic_action; #include "../lib/util/xfile.h" #include "../lib/util/mutex.h" #include "../lib/util/byteorder.h" +#include "../lib/util/talloc_stack.h" /** * assert macros diff --git a/source3/Makefile.in b/source3/Makefile.in index eee03dbaa8..120b98064e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -320,7 +320,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \ ../lib/util/xfile.o ../lib/util/util_strlist.o \ ../lib/util/util_file.o ../lib/util/data_blob.o \ ../lib/util/util.o ../lib/util/fsusage.o \ - ../lib/util/params.o + ../lib/util/params.o ../lib/util/talloc_stack.o CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \ ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \ @@ -328,7 +328,7 @@ CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_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/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o \ lib/interfaces.o lib/memcache.o \ lib/util_transfer_file.o lib/async_req.o \ lib/async_sock.o \ diff --git a/source3/include/includes.h b/source3/include/includes.h index 6b25982ff7..035d46fe0a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -654,7 +654,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "dbwrap.h" #include "packet.h" #include "ctdbd_conn.h" -#include "talloc_stack.h" +#include "../lib/util/talloc_stack.h" #include "memcache.h" #include "async_req.h" #include "async_smb.h" |