[Asterisk-cvs] asterisk pbx.c,1.161,1.162 utils.c,1.21,1.22

[markster at lists.digium.com]

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

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


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- pbx.c	16 Oct 2004 19:46:02 -0000	1.161
+++ pbx.c	17 Oct 2004 22:13:05 -0000	1.162
@@ -4818,7 +4818,7 @@
 			res = ast_waitstream(chan, AST_DIGIT_ANY);
 			ast_stopstream(chan);
 		} else {
-			ast_log(LOG_WARNING, "ast_streamfile failed on %s fro %s\n", chan->name, (char*)data);
+			ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char*)data);
 			res = 0;
 		}
 	}

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- utils.c	5 Oct 2004 06:46:11 -0000	1.21
+++ utils.c	17 Oct 2004 22:13:05 -0000	1.22
@@ -365,7 +365,7 @@
 }
 
 
-#ifndef LINUX
+#ifndef __linux__
 #undef pthread_create /* For ast_pthread_create function only */
 int ast_pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data)
 {
@@ -381,6 +381,8 @@
 }
 #endif /* ! LINUX */
 
+/* Case-insensitive substring matching */
+#ifndef LINUX
 static char *upper(const char *orig, char *buf, int bufsize)
 {
 	int i;
@@ -394,8 +396,6 @@
 	return buf;
 }
 
-/* Case-insensitive substring matching */
-#ifndef LINUX
 char *ast_strcasestr(const char *haystack, const char *needle)
 {
 	char *u1, *u2;