X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=e838b3d87f23a64faa7eb4829f38c2dbcac7cf1c;hp=55548620c7a67996b74aac62f2c3cb862ee575b4;hb=9230155e692c3a2303a267759183dd1ad264dda1;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99

diff --git a/dccp_send.c b/dccp_send.c
index 55548620..e838b3d8 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -56,7 +56,7 @@ static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno,
 	if (listen_fd < 0)
 		return;
 	FD_SET(listen_fd, rfds);
-	*max_fileno = MAX(*max_fileno, listen_fd);
+	*max_fileno = PARA_MAX(*max_fileno, listen_fd);
 }
 
 static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
@@ -119,7 +119,7 @@ static int dccp_write(int fd, const char *buf, size_t len)
 	size_t send, written = 0;
 	int ret;
 again:
-	send = MIN(1024, len - written);
+	send = PARA_MIN(1024, len - written);
 	ret = write(fd, buf + written, send);
 	if (ret < 0)
 		goto err_out;
@@ -234,8 +234,9 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
 	ret = dccp_open();
-	if (ret < 0)
+	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	else
+		s->status = SENDER_OFF;
+	} else
 		s->status = SENDER_ON;
 }