[asterisk-commits] tilghman: branch 1.6.1 r177663 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Feb 20 11:28:28 2009
New Revision: 177663

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177663
Log:
Merged revisions 177661 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177661 | tilghman | 2009-02-20 11:22:19 -0600 (Fri, 20 Feb 2009) | 2 lines
  
  Oops, merge broke trunk
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=177663&r1=177662&r2=177663
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Fri Feb 20 11:28:28 2009
@@ -118,8 +118,6 @@
 #ifdef IMAP_STORAGE
 #include "asterisk/threadstorage.h"
 
-AST_MUTEX_DEFINE_STATIC(imaptemp_lock);
-static char imaptemp[1024];
 static char imapserver[48];
 static char imapport[8];
 static char imapflags[128];
@@ -136,7 +134,7 @@
 struct vm_state;
 struct ast_vm_user;
 
-AST_THREADSTORAGE(ts_vmstate, ts_vmstate_init);
+AST_THREADSTORAGE(ts_vmstate);
 
 /* Forward declarations for IMAP */
 static int init_mailstream(struct vm_state *vms, int box);