Merged revisions 291791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r291791 | jpeeler | 2010-10-14 13:45:02 -0500 (Thu, 14 Oct 2010) | 10 lines Add missing ifdefs for test framework and new locale code. (closes issue #18137) Reported by: ovi Patches: 18137_test_framework_ifdef.patch uploaded by wdoekes (license 717) 18137_localelist_warning.patch uploaded by wdoekes (license 717) Tested by: ovi ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@291792 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
691cd93663
commit
4626f5c932
|
@ -250,7 +250,9 @@ static int tzparse P((const char * name, struct state * sp,
|
||||||
int lastditch));
|
int lastditch));
|
||||||
|
|
||||||
static AST_LIST_HEAD_STATIC(zonelist, state);
|
static AST_LIST_HEAD_STATIC(zonelist, state);
|
||||||
|
#ifdef HAVE_NEWLOCALE
|
||||||
static AST_LIST_HEAD_STATIC(localelist, locale_entry);
|
static AST_LIST_HEAD_STATIC(localelist, locale_entry);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef TZ_STRLEN_MAX
|
#ifndef TZ_STRLEN_MAX
|
||||||
#define TZ_STRLEN_MAX 255
|
#define TZ_STRLEN_MAX 255
|
||||||
|
@ -554,9 +556,12 @@ static void *notify_daemon(void *data)
|
||||||
stat(name, &st);
|
stat(name, &st);
|
||||||
lstat(name, &lst);
|
lstat(name, &lst);
|
||||||
if (st.st_mtime > cur->mtime[0] || lst.st_mtime > cur->mtime[1]) {
|
if (st.st_mtime > cur->mtime[0] || lst.st_mtime > cur->mtime[1]) {
|
||||||
|
#ifdef TEST_FRAMEWORK
|
||||||
if (test) {
|
if (test) {
|
||||||
ast_test_status_update(test, "Removing cached TZ entry '%s' because underlying file changed. (%ld != %ld) or (%ld != %ld)\n", name, st.st_mtime, cur->mtime[0], lst.st_mtime, cur->mtime[1]);
|
ast_test_status_update(test, "Removing cached TZ entry '%s' because underlying file changed. (%ld != %ld) or (%ld != %ld)\n", name, st.st_mtime, cur->mtime[0], lst.st_mtime, cur->mtime[1]);
|
||||||
} else {
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
ast_log(LOG_NOTICE, "Removing cached TZ entry '%s' because underlying file changed.\n", name);
|
ast_log(LOG_NOTICE, "Removing cached TZ entry '%s' because underlying file changed.\n", name);
|
||||||
}
|
}
|
||||||
AST_LIST_REMOVE_CURRENT(list);
|
AST_LIST_REMOVE_CURRENT(list);
|
||||||
|
|
Reference in New Issue