diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-13 04:03:56 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-13 04:03:56 +0000 |
commit | b84368cafab80dafcc75ec6c68b3c6874426ff88 (patch) | |
tree | e51d4411ca9ce8d2e487e2d1f635122a1fa41ff5 /asterisk.c | |
parent | 3b703e12328b92e219288fea099c896936b31558 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33780 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r-- | asterisk.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/asterisk.c b/asterisk.c index c0605f036..b10dcba10 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1803,17 +1803,12 @@ static void ast_remotecontrol(char * data) if (option_exec && data) { /* hack to print output then exit if asterisk -rx is used */ char tempchar; -#ifdef __Darwin__ - struct pollfd fds[0]; - fds[0].fd = ast_consock; - fds[0].events = POLLIN; - fds[0].revents = 0; - while (poll(fds, 1, 100) > 0) { + struct pollfd fds; + fds.fd = ast_consock; + fds.events = POLLIN; + fds.revents = 0; + while (poll(&fds, 1, 100) > 0) ast_el_read_char(el, &tempchar); - } -#else - while (!ast_el_read_char(el, &tempchar)); -#endif return; } for(;;) { |