diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
| commit | a6624c7cb7f47281f01834c00d31322dfe9b16f2 (patch) | |
| tree | 8f9619816ca742397dc8ef00048607184c980a96 /libc/stdlib/malloc-standard | |
| parent | 7eac2221e41a367288359189d4bc557ae367c01a (diff) | |
| download | uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.bz2 uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/malloc-standard')
| -rw-r--r-- | libc/stdlib/malloc-standard/Makefile.in | 3 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/mallinfo.c | 1 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.c | 1 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.h | 1 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/realloc.c | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/libc/stdlib/malloc-standard/Makefile.in b/libc/stdlib/malloc-standard/Makefile.in index 1d29703c4..12445bbf1 100644 --- a/libc/stdlib/malloc-standard/Makefile.in +++ b/libc/stdlib/malloc-standard/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. @@ -22,6 +21,8 @@ STDLIB_MALLOC_STANDARD_SRC := $(patsubst %.c,$(STDLIB_MALLOC_STANDARD_DIR)/%.c,$ STDLIB_MALLOC_STANDARD_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_STANDARD_OUT)/%.o,$(CSRC)) libc-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ) +libc-a-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ) +libc-so-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ:.o=.os) objclean-y += stdlib_malloc_standard_objclean diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c index 89c9a6e7e..4f274ed32 100644 --- a/libc/stdlib/malloc-standard/mallinfo.c +++ b/libc/stdlib/malloc-standard/mallinfo.c @@ -17,7 +17,6 @@ #include "malloc.h" libc_hidden_proto(fprintf) -libc_hidden_proto(stderr) /* ------------------------------ mallinfo ------------------------------ */ libc_hidden_proto(mallinfo) diff --git a/libc/stdlib/malloc-standard/malloc.c b/libc/stdlib/malloc-standard/malloc.c index 10d421330..b4b1216ed 100644 --- a/libc/stdlib/malloc-standard/malloc.c +++ b/libc/stdlib/malloc-standard/malloc.c @@ -19,7 +19,6 @@ #ifdef __UCLIBC_HAS_THREADS__ pthread_mutex_t __malloc_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -libc_hidden_data_def(__malloc_lock) #endif /* diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index a3fabb0c4..453d69736 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -31,7 +31,6 @@ libc_hidden_proto(abort) #ifdef __UCLIBC_HAS_THREADS__ # include <pthread.h> extern pthread_mutex_t __malloc_lock; -libc_hidden_proto(__malloc_lock) #endif #define LOCK __pthread_mutex_lock(&__malloc_lock) #define UNLOCK __pthread_mutex_unlock(&__malloc_lock) diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c index ae2d33bee..f25d6d989 100644 --- a/libc/stdlib/malloc-standard/realloc.c +++ b/libc/stdlib/malloc-standard/realloc.c @@ -52,7 +52,7 @@ void* realloc(void* oldmem, size_t bytes) return malloc(bytes); if (! bytes) { free (oldmem); - return malloc(bytes); + return NULL; } LOCK; |