Merged revisions 304985 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304985 | tilghman | 2011-01-31 01:27:13 -0600 (Mon, 31 Jan 2011) | 16 lines
  
  Merged revisions 304978 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r304978 | tilghman | 2011-01-31 01:25:14 -0600 (Mon, 31 Jan 2011) | 9 lines
    
    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: https://origsvn.digium.com/svn/asterisk/trunk@304989 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

@@ -6029,7 +6029,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 */
@@ -7773,9 +7773,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