Thread fixes, vm fix (bug #2665)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4030 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/lock.h

@@ -368,6 +368,8 @@ static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
 #define AST_MUTEX_INITIALIZER __use_AST_MUTEX_DEFINE_STATIC_rather_than_AST_MUTEX_INITIALIZER__
 
 #define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__
+#ifndef __linux__
 #define pthread_create __use_ast_pthread_create_instead__
+#endif
 
 #endif

include/asterisk/utils.h

@@ -15,6 +15,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <pthread.h>
+#include <asterisk/lock.h>
 
 static inline int ast_strlen_zero(const char *s)
 {
@@ -41,7 +42,7 @@ extern int ast_utils_init(void);
 #endif
 #define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
 
-#ifdef LINUX
+#ifdef __linux__
 #define ast_pthread_create pthread_create
 #define ast_strcasestr strcasestr
 #else
@@ -50,7 +51,7 @@ extern int ast_utils_init(void);
 #define	PTHREAD_ATTR_STACKSIZE		2097152
 #endif /* PTHREAD_ATTR_STACKSIZE */
 extern int ast_pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data);
-#endif /* LINUX */
+#endif /* __linux__ */
 
 extern char *ast_strcasestr(const char *, const char *);