diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-05 11:49:11 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-05 11:49:11 -0600 |
| commit | e21f1684778f911afbcd3f8e3461b66501db58e4 (patch) | |
| tree | 5168e61c750fb7f96a0fb990f02246135bdb9c53 /main | |
| parent | d70f53c6724ec0acd5ed96b08fcaf17dbbe58c69 (diff) | |
| parent | 974952452014013545a2aba1cd1fd8304427b429 (diff) | |
Merge "BuildSystem: Detect whether uselocale(.) is available."
Diffstat (limited to 'main')
| -rw-r--r-- | main/stdtime/localtime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 2976e59c1..d0be9bb84 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -310,7 +310,7 @@ static struct state * sstate_alloc(void); static void sstate_free(struct state *p); static AST_LIST_HEAD_STATIC(zonelist, state); -#ifdef HAVE_NEWLOCALE +#if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) static AST_LIST_HEAD_STATIC(localelist, locale_entry); #endif @@ -2362,7 +2362,7 @@ struct timeval ast_mktime(struct ast_tm *tmp, const char *zone) return time1(tmp, localsub, 0L, sp); } -#ifdef HAVE_NEWLOCALE +#if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) static struct locale_entry *find_by_locale(locale_t locale) { struct locale_entry *cur; |