diff options
author | Mark Spencer <markster@digium.com> | 2004-06-22 17:42:14 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-06-22 17:42:14 +0000 |
commit | 5546e323550422b8a84e7c1d0b69e11623666cb6 (patch) | |
tree | a3a0875ae4e73c9d9a1fc67f56ffa1ce73fe5457 /asterisk.c | |
parent | 2f4a0dc3f5743f625976e39c031adbc7002f57d0 (diff) |
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
-rwxr-xr-x | asterisk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/asterisk.c b/asterisk.c index 105a02fb7..39a20ec40 100755 --- a/asterisk.c +++ b/asterisk.c @@ -49,6 +49,7 @@ #include "asterisk.h" #include <asterisk/config.h> #include <asterisk/config_pvt.h> +#include <sys/resource.h> #if defined(__FreeBSD__) #include <netdb.h> @@ -1561,6 +1562,11 @@ int main(int argc, char *argv[]) term_init(); 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(); |