yaffs direct: Change yaffs_malloc to yaffsfs_malloc etc

[yaffs2.git] / direct / basic-test / yaffs_osglue.c

diff --git a/direct/basic-test/yaffs_osglue.c b/direct/basic-test/yaffs_osglue.c
index 14963839b23a2180e8f4b49515ad4d155e7565f6..7eaafc933eaf0194aeaad86d17bdf809d2cae202 100644 (file)
--- a/direct/basic-test/yaffs_osglue.c
+++ b/direct/basic-test/yaffs_osglue.c
@@ -39,7 +39,7 @@ int yaffsfs_GetLastError(void)
 
 
 #ifdef CONFIG_YAFFS_USE_PTHREADS
-#include <pthreads.h>
+#include <pthread.h>
 static pthread_mutex_t mutex1;
 
 
@@ -55,7 +55,7 @@ void yaffsfs_Unlock(void)
 
 void yaffsfs_LockInit(void)
 {
-       pthread_mutex_init( &mutex, NULL);
+       pthread_mutex_init( &mutex1, NULL);
 }
 
 #else
@@ -83,7 +83,7 @@ static int yaffs_kill_alloc = 0;
 static size_t total_malloced = 0;
 static size_t malloc_limit = 0 & 6000000;
 
-void *yaffs_malloc(size_t size)
+void *yaffsfs_malloc(size_t size)
 {
        void * this;
        if(yaffs_kill_alloc)
@@ -97,7 +97,7 @@ void *yaffs_malloc(size_t size)
        return this;
 }
 
-void yaffs_free(void *ptr)
+void yaffsfs_free(void *ptr)
 {
        free(ptr);
 }