From 37b5cdb9d458e3174b3350736c760bcf438f06af Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 19 May 2006 19:04:24 +0000 Subject: Merged revisions 28754 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r28754 | russell | 2006-05-19 15:01:17 -0400 (Fri, 19 May 2006) | 6 lines This explicit poll is only needed on mac. In fact, it breaks some systems such as some versions of Fedora, causing 'asterisk -rx' to never exit. This has been tested on systems showing the asterisk -rx problem, as well as other unaffected versions of linux, mac osx 10.4, and FreeBSD 6. (issue #7071) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@28771 f38db490-d61c-443f-a65b-d21fe96a405b --- asterisk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'asterisk.c') diff --git a/asterisk.c b/asterisk.c index 93eab8a43..5c1807f86 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2027,13 +2027,17 @@ static void ast_remotecontrol(char * data) if (ast_opt_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 (;;) { -- cgit v1.2.3