automerge commit

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

diff --git a/cdr.c b/cdr.c
index 442de9c1fdd2a12f4174bda20e60f00ee219675e..edad68e48d7c342793f9ce86179a119fef3e2913 100644 (file)
--- a/cdr.c
+++ b/cdr.c
@@ -1136,7 +1136,6 @@ static int do_reload(void)
        int was_enabled;
        int was_batchmode;
        int res=0;
-       pthread_attr_t attr;
 
        ast_mutex_lock(&cdr_batch_lock);
 
@@ -1197,7 +1196,7 @@ static int do_reload(void)
           if it does not exist */
        if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
                ast_cond_init(&cdr_pending_cond, NULL);
-               if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
+               if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
                        ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
                        ast_sched_del(sched, cdr_sched);
                } else {

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 493a3e93b48ee7c677640a8525477b43e9b5c23d..74b889b9e06a06c86ef53a9974fd09d9a6a1da06 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11434,7 +11434,6 @@ restartsearch:
 /*! \brief  restart_monitor: Start the channel monitor thread ---*/
 static int restart_monitor(void)
 {
-       pthread_attr_t attr;
        /* If we're supposed to be stopped -- stay stopped */
        if (monitor_thread == AST_PTHREADT_STOP)
                return 0;