From: Andre Noll <maan@systemlinux.org>
Date: Mon, 28 Dec 2009 20:40:31 +0000 (+0100)
Subject: Link buffer_tree.o into para_recv and para_write.
X-Git-Tag: v0.4.2~256
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=822966ba3106964241ec5cb042127d5fdbd7ba83

Link buffer_tree.o into para_recv and para_write.
---

diff --git a/buffer_tree.c b/buffer_tree.c
index b3aea0e4..084827e3 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -44,8 +44,6 @@ struct btr_node {
 #define FOR_EACH_BUFFER_REF_SAFE(_br, _tmp, _btrn) \
 	list_for_each_entry_safe((_br), (_tmp), &(_btrn)->input_queue, node)
 
-INIT_STDERR_LOGGING(0);
-
 struct btr_node *btr_new_node(char *name, struct btr_node *parent)
 {
 	struct btr_node *btrn = para_malloc(sizeof(*btrn));
@@ -198,8 +196,3 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
 		size += br_available_bytes(br);
 	return size;
 }
-
-int main(void)
-{
-	return 1;
-}
diff --git a/configure.ac b/configure.ac
index 9c2fe5b2..e3c9b4a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client exec send_common ggo
 udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
 server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
-wma_common wmadec_filter
+wma_common wmadec_filter buffer_tree
 "
 
 all_executables="server recv filter audioc write client afh"
@@ -99,7 +99,7 @@ all_executables="server recv filter audioc write client afh"
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	fd sched stdout ggo udp_recv fec"
+	fd sched stdout ggo udp_recv fec buffer_tree"
 recv_ldflags=""
 
 receivers=" http dccp udp"
@@ -139,7 +139,8 @@ server_ldflags="-losl"
 server_audio_formats=" mp3"
 
 write_cmdline_objs="add_cmdline(write file_write)"
-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+write_errlist_objs="write write_common file_write time fd string sched stdin
+	buffer_tree ggo"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
diff --git a/error.h b/error.h
index 75582106..6b5e300f 100644
--- a/error.h
+++ b/error.h
@@ -34,6 +34,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SERVER_COMMAND_LIST_ERRORS
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS
+#define BUFFER_TREE_ERRORS
 
 
 extern const char **para_errlist[];