[uClibc-cvs] uClibc/libc/stdlib/malloc-simple alloc.c,1.13,1.14

[Erik Andersen]

Update of /var/cvs/uClibc/libc/stdlib/malloc-simple
In directory nail:/tmp/cvs-serv32282/libc/stdlib/malloc-simple

Modified Files:
	alloc.c 
Log Message:
Include missing errno.h header (as noted by Alan Hourihane).
Fix uninitialized pthread mutex used to lock the list of aligned
memory blocks.


Index: alloc.c
===================================================================
RCS file: /var/cvs/uClibc/libc/stdlib/malloc-simple/alloc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- alloc.c	30 Dec 2003 10:40:49 -0000	1.13
+++ alloc.c	14 Jan 2004 22:37:55 -0000	1.14
@@ -6,12 +6,14 @@
  * Parts of the memalign code were stolen from malloc-930716.
  */
 
+#define _GNU_SOURCE
 #include <features.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/mman.h>
 
 
@@ -121,9 +123,9 @@
 #ifdef L_memalign
 #ifdef __UCLIBC_HAS_THREADS__
 #include <pthread.h>
-extern pthread_mutex_t __malloclock;
-# define LOCK	__pthread_mutex_lock(&__malloclock)
-# define UNLOCK	__pthread_mutex_unlock(&__malloclock);
+pthread_mutex_t __malloc_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+# define LOCK	__pthread_mutex_lock(&__malloc_lock)
+# define UNLOCK	__pthread_mutex_unlock(&__malloc_lock);
 #else
 # define LOCK
 # define UNLOCK