X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=bb9534cb6bea3a8953a01ad09213994f1d6ade4b;hp=926f78082532761e50cf3be8b500b47184529b9c;hb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99 diff --git a/http_send.c b/http_send.c index 926f7808..bb9534cb 100644 --- a/http_send.c +++ b/http_send.c @@ -346,6 +346,7 @@ err_out: free(hc); } +/* FIXME: use para_fdset */ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds, fd_set *wfds) { @@ -354,7 +355,7 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf if (server_fd < 0) return; FD_SET(server_fd, rfds); - *max_fileno = MAX(*max_fileno, server_fd); + *max_fileno = PARA_MAX(*max_fileno, server_fd); list_for_each_entry_safe(hc, tmp, &clients, node) { //PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status); hc->check_r = 0; @@ -365,20 +366,20 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf break; case HTTP_CONNECTED: /* need to recv get request */ FD_SET(hc->fd, rfds); - *max_fileno = MAX(*max_fileno, hc->fd); + *max_fileno = PARA_MAX(*max_fileno, hc->fd); hc->check_r = 1; break; case HTTP_GOT_GET_REQUEST: /* need to send ok msg */ case HTTP_INVALID_GET_REQUEST: /* need to send err msg */ FD_SET(hc->fd, wfds); - *max_fileno = MAX(*max_fileno, hc->fd); + *max_fileno = PARA_MAX(*max_fileno, hc->fd); hc->check_w = 1; break; case HTTP_SENT_OK_MSG: if (!af || !afs_playing()) break; /* wait until server starts playing */ FD_SET(hc->fd, wfds); - *max_fileno = MAX(*max_fileno, hc->fd); + *max_fileno = PARA_MAX(*max_fileno, hc->fd); hc->check_w = 1; break; }