dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

More BSD compile fixes (bugs #1754 and #1756) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3121 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-05-31 19:40:23 +00:00
parent cd8e03c0b7
commit bc5de50bc9
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cdr/Makefile
View File

@ -17,6 +17,11 @@ MODS=cdr_csv.so
CFLAGS+=-fPIC
OSARCH=$(shell uname -s)
ifeq (${OSARCH},FreeBSD)
SOLINK+=-L/usr/local/lib
endif
#
# unixODBC stuff...
#

4
channels/Makefile
View File

@ -49,6 +49,10 @@ endif
ifneq (${OSARCH},Darwin)
CHANNEL_LIBS+=chan_oss.so
endif
ifeq (${OSARCH},FreeBSD)
SOLINK+=-L/usr/local/lib
CHANNEL_LIBS+=chan_oss.so
endif
CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)

5
dns.c
View File

@ -154,8 +154,11 @@ static int dns_parse_answer(void *context,
#if defined(res_ninit)
#define HAS_RES_NINIT
#else
static ast_mutex_t res_lock = AST_MUTEX_INITIALIZER;
#if 0
#warning "Warning, res_ninit is missing... Could have reentrancy issues"
#endif
#endif
int ast_search_dns(void *context,
const char *dname, int class, int type,
@ -171,6 +174,7 @@ int ast_search_dns(void *context,
res_ninit(&dnsstate);
res = res_nsearch(&dnsstate, dname, class, type, answer, sizeof(answer));
#else
ast_mutex_lock(&res_lock);
res_init();
res = res_search(dname, class, type, answer, sizeof(answer));
#endif
@ -192,6 +196,7 @@ int ast_search_dns(void *context,
#ifndef __APPLE__
res_close();
#endif
ast_mutex_unlock(&res_lock);
#endif
return ret;
}