diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 19:07:56 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 19:07:56 +0000 |
| commit | a5842441d6aa2f39bcb0045d4dd3e13cce225561 (patch) | |
| tree | b0d3d3770f54ff0251decbdc4b0c8cb9a33482bf /asterisk.c | |
| parent | ca3f1895fc7937ce7e81f03748a7a862a5d90e0b (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@28788 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
| -rw-r--r-- | asterisk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/asterisk.c b/asterisk.c index 334d322df..c0605f036 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1803,13 +1803,17 @@ 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) { + while (poll(fds, 1, 100) > 0) { ast_el_read_char(el, &tempchar); } +#else + while (!ast_el_read_char(el, &tempchar)); +#endif return; } for(;;) { |