Thread fixes, vm fix (bug #2665)

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

1 files changed, 3 insertions, 3 deletions

diff --git a/utils.c b/utils.c
index a454ea4bf..49fe1f3fe 100755
--- a/utils.c
+++ b/utils.c
@@ -365,7 +365,7 @@ int ast_utils_init(void)
 }
 
 
-#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 @@ int ast_pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_ro
 }
 #endif /* ! LINUX */
 
+/* Case-insensitive substring matching */
+#ifndef LINUX
 static char *upper(const char *orig, char *buf, int bufsize)
 {
 	int i;
@@ -394,8 +396,6 @@ static char *upper(const char *orig, char *buf, int bufsize)
 	return buf;
 }
 
-/* Case-insensitive substring matching */
-#ifndef LINUX
 char *ast_strcasestr(const char *haystack, const char *needle)
 {
 	char *u1, *u2;