From: Automerge script <automerge@asterisk.org>
Date: Fri, 19 May 2006 19:07:56 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.9.1-netsec~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134eb7c8f62c0f3c570bf46de919548ab3d06300;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/asterisk.c b/asterisk.c
index 334d322df4..c0605f036c 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(;;) {