diff options
| -rwxr-xr-x | apps/app_macro.c | 2 | ||||
| -rwxr-xr-x | dns.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 6cb07bd6f..3189d077b 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -202,7 +202,7 @@ out: /* If we're leaving the macro normally, restore original information */ chan->priority = oldpriority; strncpy(chan->context, oldcontext, sizeof(chan->context) - 1); - if (!chan->_softhangup) { + if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) { /* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */ strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1); if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) { @@ -155,13 +155,13 @@ int ast_search_dns(void *context, const char *dname, int class, int type, int (*callback)(void *context, u_char *answer, int len, u_char *fullanswer)) { -#ifdef __Linux__ +#ifdef linux struct __res_state dnsstate; #endif char answer[MAX_SIZE]; int res, ret = -1; -#ifdef __Linux__ +#ifdef linux res_ninit(&dnsstate); res = res_nsearch(&dnsstate, dname, class, type, answer, sizeof(answer)); #else @@ -180,7 +180,7 @@ int ast_search_dns(void *context, else ret = 1; } -#if defined(__Linux__) +#if defined(linux) res_nclose(&dnsstate); #else #ifndef __APPLE__ |