diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-09-28 17:11:30 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-09-28 17:11:30 +0000 |
commit | 0148ea8a110889c99ce7dffefa0eea971d31fd29 (patch) | |
tree | 903ba35aeeab254aae0fdb2059f4d21ffbd34f2e | |
parent | d8c84c5f94c422d0f49a8ae94e63709ffa788a9a (diff) |
Fix threads in FreeBSD (bug #2478)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3850 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 4 | ||||
-rwxr-xr-x | asterisk.c | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -138,8 +138,8 @@ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/us ifeq (${OSARCH},FreeBSD) OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -CFLAGS+=$(if ${OSVERSION}<500016,-D_THREAD_SAFE) -LIBS+=$(if ${OSVERSION}<502102,-lc_r,-pthread) +CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) +LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) INCLUDE+=-I/usr/local/include CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) endif # FreeBSD diff --git a/asterisk.c b/asterisk.c index 3c4d230ee..30740cd59 100755 --- a/asterisk.c +++ b/asterisk.c @@ -1728,10 +1728,6 @@ int main(int argc, char *argv[]) printf(term_end()); fflush(stdout); - /* Test recursive mutex locking. */ - if (test_for_thread_safety()) - ast_verbose("Warning! Asterisk is not thread safe.\n"); - if (option_console && !option_verbose) ast_verbose("[ Reading Master Configuration ]"); ast_readconfig(); @@ -1796,6 +1792,10 @@ int main(int argc, char *argv[]) ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno)); } + /* Test recursive mutex locking. */ + if (test_for_thread_safety()) + ast_verbose("Warning! Asterisk is not thread safe.\n"); + ast_makesocket(); sigemptyset(&sigs); sigaddset(&sigs, SIGHUP); |