From 7bc881ccc5ec6bc1214af794bf344e54d230c7a3 Mon Sep 17 00:00:00 2001
From: kieranm <kieranm>
Date: Fri, 30 May 2008 11:37:15 +0000
Subject: [PATCH] Fix BUG#23254.  Change macro definition of mem_* to allow
 passing as function pointers when MEM_LIBC_MALLOC is defined.

---
 CHANGELOG              | 4 ++++
 src/include/lwip/mem.h | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index effd6ef7..377821dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2008-05-30 Kieran Mansley
+  * mem.h: Fix BUG#23254.  Change macro definition of mem_* to allow
+    passing as function pointers when MEM_LIBC_MALLOC is defined.
+
   2008-05-09 Jonathan Larmour
   * err.h, err.c, sockets.c: Fix bug #23119: Reorder timeout error code to
     stop it being treated as a fatal error.
diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index cf917334..ff9521f3 100644
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -50,16 +50,16 @@ typedef size_t mem_size_t;
  * allow these defines to be overridden.
  */
 #ifndef mem_free
-#define mem_free(x) free(x)
+#define mem_free free
 #endif
 #ifndef mem_malloc
-#define mem_malloc(x) malloc(x)
+#define mem_malloc malloc
 #endif
 #ifndef mem_calloc
-#define mem_calloc(x, y) calloc(x, y)
+#define mem_calloc calloc
 #endif
 #ifndef mem_realloc
-#define mem_realloc(x, size) (x)
+#define mem_realloc realloc
 #endif
 #else /* MEM_LIBC_MALLOC */