[svn-commits] tilghman: trunk r177661 - /trunk/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Feb 20 11:22:19 2009
New Revision: 177661

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177661
Log:
Oops, merge broke trunk

Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=177661&r1=177660&r2=177661
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Feb 20 11:22:19 2009
@@ -301,8 +301,6 @@
  ***/
 
 #ifdef IMAP_STORAGE
-AST_MUTEX_DEFINE_STATIC(imaptemp_lock);
-static char imaptemp[1024];
 static char imapserver[48];
 static char imapport[8];
 static char imapflags[128];
@@ -319,7 +317,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);