From: Automerge script <automerge@asterisk.org>
Date: Tue, 13 Jun 2006 04:03:56 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.10-netsec~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7648cca4234285706287ebf20aca4e3d2072d38;p=thirdparty%2Fasterisk.git

automerge commit

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

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