[asterisk-commits] mmichelson: branch mmichelson/imap_consistency r133043 - in /team/mmichelson/...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 23 13:15:18 2008
New Revision: 133043

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133043
Log:
Fix compilation in non-IMAP storage mode.

I believe this may be ready for a merge real soon


Modified:
    team/mmichelson/imap_consistency/   (props changed)
    team/mmichelson/imap_consistency/apps/app_voicemail.c

Propchange: team/mmichelson/imap_consistency/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 23 13:15:18 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-132997
+/branches/1.4:1-132976

Modified: team/mmichelson/imap_consistency/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/imap_consistency/apps/app_voicemail.c?view=diff&rev=133043&r1=133042&r2=133043
==============================================================================
--- team/mmichelson/imap_consistency/apps/app_voicemail.c (original)
+++ team/mmichelson/imap_consistency/apps/app_voicemail.c Wed Jul 23 13:15:18 2008
@@ -2686,7 +2686,7 @@
 }
 #endif
 #endif
-
+#if (defined(IMAP_STORAGE) || defined(ODBC_STORAGE))
 static int remove_file(char *dir, int msgnum)
 {
 	char fn[PATH_MAX];
@@ -2703,6 +2703,7 @@
 	unlink(full_fn);
 	return 0;
 }
+#endif
 
 static int copy(char *infile, char *outfile)
 {
@@ -3662,8 +3663,8 @@
 {
 #ifdef IMAP_STORAGE
 	int newmsgs, oldmsgs;
+#endif
 	struct vm_state *vms = NULL;
-#endif
 	char txtfile[PATH_MAX], tmptxtfile[PATH_MAX];
 	char callerid[256];
 	FILE *txt;