Merged revisions 61777 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61777 | dhubbard | 2007-04-24 13:20:31 -0500 (Tue, 24 Apr 2007) | 1 line

removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()
........

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f988c7c337f83cf79fb7f67bc19c42344a83f4f8..5e7ead08e0ae96472f00861d839385a82d9cd2d2 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6932,14 +6932,8 @@ static int restart_monitor(void)
                return -1;
        }
        if (monitor_thread != AST_PTHREADT_NULL) {
-               /* Just signal it to be sure it wakes up */
-#if 0
-               pthread_cancel(monitor_thread);
-#endif
+               /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
-#if 0
-               pthread_join(monitor_thread, NULL);
-#endif
        } else {
                /* Start a new monitor */
                if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) {