Fixed bug #28866 (mem_realloc function defined in mem.h)

diff --git a/CHANGELOG b/CHANGELOG
index 087aa1df98596369273a6912939248ad6751644d..3eb037aec2fb3256ed87937922c4bb698e26345d 100644 (file)
--- 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 327c2049ffabe0dfa0f8300e544962a03c36cd80..f2d8fc3f0239496e0fb583f8646dfa20809a4277 100644 (file)
--- 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 */