From 2b71e94f3bfe5f359873339b7c8a30caf66cf55e Mon Sep 17 00:00:00 2001 From: tilghman Date: Mon, 31 Jan 2011 07:25:14 +0000 Subject: Merged revisions 304952 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r304952 | tilghman | 2011-01-31 00:54:45 -0600 (Mon, 31 Jan 2011) | 2 lines Fix compilation when ODBC_STORAGE is defined. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@304978 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_voicemail.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 0bcd8e82e..12be8153f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5758,7 +5758,7 @@ leave_vm_out: return res; } -#ifndef IMAP_STORAGE +#if !defined(IMAP_STORAGE) && !defined(ODBC_STORAGE) static int resequence_mailbox(struct ast_vm_user *vmu, char *dir, int stopcount) { /* we know the actual number of messages, so stop process when number is hit */ @@ -7478,9 +7478,8 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) if (last_msg < -1) { return last_msg; - } #ifndef ODBC_STORAGE - else if (vms->lastmsg != last_msg) { + } else if (vms->lastmsg != last_msg) { ast_log(LOG_NOTICE, "Resequencing mailbox: %s, expected %d but found %d message(s) in box with max threshold of %d.\n", vms->curdir, last_msg + 1, vms->lastmsg + 1, vmu->maxmsg); resequence_mailbox(vmu, vms->curdir, count_msg); #endif -- cgit v1.2.3