diff --git a/CHANGELOG b/CHANGELOG index 087aa1df..3eb037ae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -103,12 +103,14 @@ HISTORY ++ Bugfixes: + 2010-02-12: Simon Goldschmidt + * mem.h: Fixed bug #28866 (mem_realloc function defined in mem.h) + 2010-02-09: Simon Goldschmidt * api_lib.c, api_msg.c, sockets.c, api.h, api_msg.h: Fixed bug #22110 (recv() makes receive window update for data that wasn't received by application) - 2010-02-09: Simon Goldschmidt/Stephane Lesage * sockets.c: Fixed bug #28853 (lwip_recvfrom() returns 0 on receive time-out or any netconn_recv() error) diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h index 327c2049..f2d8fc3f 100644 --- a/src/include/lwip/mem.h +++ b/src/include/lwip/mem.h @@ -59,11 +59,7 @@ typedef size_t mem_size_t; #define mem_calloc calloc #endif #ifndef mem_realloc -static void *mem_realloc(void *mem, mem_size_t size) -{ - LWIP_UNUSED_ARG(size); - return mem; -} +#define mem_realloc(mem, size) (mem) #endif #else /* MEM_LIBC_MALLOC */