diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-03 14:42:54 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-03 14:42:54 +0000 |
| commit | 0d750f26d02a4fba0bd702bd79649e3a4bca080c (patch) | |
| tree | 4bbe257c15d9b66629ce9c69ddfef08675670e5a /apps | |
| parent | 7581a33a8daf16b04029c9aaae83ed6acae88d4c (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140888 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 350a744c0..0969c8091 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3399,6 +3399,9 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir) 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 @@ static void copy_plain_file(char *frompath, char *topath) 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 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i * 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 { |