[Asterisk-cvs] asterisk/include/asterisk lock.h, 1.24, 1.25 utils.h, 1.9, 1.10

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv14688/include/asterisk

Modified Files:
	lock.h utils.h 
Log Message:
Thread fixes, vm fix (bug #2665)


Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- lock.h	6 Oct 2004 04:30:16 -0000	1.24
+++ lock.h	17 Oct 2004 22:13:05 -0000	1.25
@@ -368,6 +368,8 @@
 #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

Index: utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- utils.h	5 Oct 2004 06:46:11 -0000	1.9
+++ utils.h	17 Oct 2004 22:13:05 -0000	1.10
@@ -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 @@
 #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 @@
 #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 *);