[asterisk-commits] mmichelson: branch 1.6.1 r140888 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep  3 09:42:54 2008
New Revision: 140888

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140888
Log:
Merged revisions 140887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r140887 | mmichelson | 2008-09-03 09:41:54 -0500 (Wed, 03 Sep 2008) | 3 lines

Fix compilation


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=140888&r1=140887&r2=140888
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Wed Sep  3 09:42:54 2008
@@ -3399,6 +3399,9 @@
 	return x - 1;
 }
 
+#endif /* #ifndef IMAP_STORAGE */
+#endif /* #else of #ifdef ODBC_STORAGE */
+#ifndef IMAP_STORAGE
 /*!
  * \brief Utility function to copy a file.
  * \param infile The path to the file to be copied. The file must be readable, it is opened in read only mode.
@@ -3510,10 +3513,6 @@
 	ast_variables_destroy(var);
 }
 
-#endif /* #ifndef IMAP_STORAGE */
-#endif /* #else of #ifdef ODBC_STORAGE */
-
-#if (!defined(ODBC_STORAGE) && !defined(IMAP_STORAGE))
 /*! 
  * \brief Removes the voicemail sound and information file.
  * \param file The path to the sound file. This will be the the folder and message index, without the extension.
@@ -4406,7 +4405,7 @@
 			 * much worse problem happening and IMAP storage doesn't call this function
 			 */
 			copy_plain_file(frompath, topath);
-			STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL);
+			STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL, NULL);
 			vm_delete(topath);
 		}
 	} else {