Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3273 f38db490-d61c-443f-a65b-d21fe96a405b

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();