summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2009-02-20 17:22:19 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2009-02-20 17:22:19 +0000
commitfefa97001a1ccdc12b3063a47181f3f3d53b6ff9 (patch)
tree9f73d6d2cc26af72ed458bfa92851ab6bcd9204a
parent138f3de410db02377d9635d362c124058c232bd6 (diff)
Oops, merge broke trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--apps/app_voicemail.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 8cfe1c958..33232e239 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -301,8 +301,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
***/
#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 @@ static char delimiter = '\0';
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);