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 c0605f036c2c4a357ab979bdcd8f040ca419287f..b10dcba10c1afe806ad06940b17a9ba0ad0cb4a4 100644 (file)
--- 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(;;) {