From 7feb116bae0b7778e8fd02fd39ce668400a83976 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Tue, 28 Jul 2009 17:18:46 +0000 Subject: [PATCH] Fixed bug #27105: "realloc() cannot replace mem_realloc()" by making mem_realloc static doing nothing when MEM_LIBC_MALLOC==1 --- CHANGELOG | 3 +++ src/include/lwip/mem.h | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index abddb649..57e54a0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -116,6 +116,9 @@ HISTORY ++ Bugfixes: + 2009-07-28 Simon Goldschmidt + * mem.h: Fixed bug #27105: "realloc() cannot replace mem_realloc()"s + 2009-07-27 Kieran Mansley * api.h api_msg.h netdb.h sockets.h: add missing #include directives diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h index ff9521f3..327c2049 100644 --- a/src/include/lwip/mem.h +++ b/src/include/lwip/mem.h @@ -59,7 +59,11 @@ typedef size_t mem_size_t; #define mem_calloc calloc #endif #ifndef mem_realloc -#define mem_realloc realloc +static void *mem_realloc(void *mem, mem_size_t size) +{ + LWIP_UNUSED_ARG(size); + return mem; +} #endif #else /* MEM_LIBC_MALLOC */