automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33780 f38db490-d61c-443f-a65b-d21fe96a405b

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(;;) {