kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tilghman's patches

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-09-21 15:23:54 +00:00
parent 27787e21ec
commit 7c59caf852
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_voicemail2.c
View File

@@ -1955,7 +1955,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
/* Can't think of how other diffs might be helpful, but I'm sure somebody will think of something. */ /* Can't think of how other diffs might be helpful, but I'm sure somebody will think of something. */
#endif #endif
if (the_zone) if (the_zone)
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, the_zone->timezone); res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, &(the_zone->timezone));
else else
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL); res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL);
#if 0 #if 0

13
stdtime/localtime.c
View File

@@ -981,11 +981,14 @@ const char * const zone;
sp = lclptr; sp = lclptr;
/* Find the right zone record */ /* Find the right zone record */
while (sp != NULL) { if (zone == NULL)
if (!strcmp(sp->name,zone)) sp = NULL;
break; else
sp = sp->next; while (sp != NULL) {
} if (!strcmp(sp->name,zone))
break;
sp = sp->next;
}
if (sp == NULL) { if (sp == NULL) {
ast_tzsetwall(); ast_tzsetwall();