X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=1fa9880210e96d8ca2509df78980453374a4e469;hp=968f84b6fcd3c6960b2dbf4e2009297e8fd1028c;hb=04473f0dc30bcfa6cb0ffd3c388b64218d93f651;hpb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf;ds=sidebyside diff --git a/audioc.c b/audioc.c index 968f84b6..1fa98802 100644 --- a/audioc.c +++ b/audioc.c @@ -22,13 +22,14 @@ #include "para.h" #include "net.h" #include "string.h" +#include "fd.h" struct gengetopt_args_info conf; char *tmpfifo; enum {E_SYNTAX, E_READ, E_WRITE, E_SOCKET, E_INIT_SOCK_ADDR, E_CONNECT, E_CREDENTIALS, E_SELECT, E_OVERRUN}; -void para_log(__unused int ll, __unused const char* fmt,...) /* no logging */ +void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */ { } @@ -120,17 +121,17 @@ int main(int argc, char *argv[]) fprintf(stderr, "loaded: %d\n", loaded); if (loaded < conf.bufsize_arg) { FD_SET(fd, &rfd); - max_fileno = MAX(max_fileno, fd); + max_fileno = PARA_MAX(max_fileno, fd); } if (loaded > 0) { FD_SET(STDOUT_FILENO, &wfd); - max_fileno = MAX(max_fileno, STDOUT_FILENO); + max_fileno = PARA_MAX(max_fileno, STDOUT_FILENO); check_write = 1; } ret = -E_OVERRUN; if (max_fileno < 0) goto out; - ret = select(max_fileno + 1, &rfd, &wfd, NULL, NULL); + ret = para_select(max_fileno + 1, &rfd, &wfd, NULL); if (ret < 0) { ret = -E_SELECT; goto out;