mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-06 01:45:11 +00:00
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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -117,8 +117,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#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];
|
||||
@@ -135,7 +133,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);
|
||||
|
||||
Reference in New Issue
Block a user