diff options
| author | dhubbard <dhubbard@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-24 18:43:53 +0000 |
|---|---|---|
| committer | dhubbard <dhubbard@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-24 18:43:53 +0000 |
| commit | e5835eeee3cff2927eaf12cfe6449c0a93323063 (patch) | |
| tree | bdd0a52b28d53ad6caefc591253a51d865ead12d /channels/chan_zap.c | |
| parent | a11120ccdb7e7f7e237ddfcfa6668e92069a924b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@61779 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index f988c7c33..5e7ead08e 100644 --- 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) { |