fixed bug #34377 MEM_SIZE_F is not defined if MEM_LIBC_MALLOC==1

diff --git a/CHANGELOG b/CHANGELOG
index df44d8d4e1bd1f0f7ab5d7e0190e018c89c3ccf4..d2c15bf370b7120d9115b4970b35e75fc40f86ec 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2011-09-24: Simon Goldschmidt
+  * mem.h: fixed bug #34377 MEM_SIZE_F is not defined if MEM_LIBC_MALLOC==1
+
   2011-09-23: Simon Goldschmidt
   * pbuf.h, tcp.c, tcp_in.c: fixed bug #33871: rejecting TCP_EVENT_RECV() for
     the last packet including FIN can lose data

diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index 9507c0aec4123ff08a302309d5915bb3e66cc684..5bb906b63fe43bb25cbcb5f1b35c4528fb16956f 100644 (file)
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -43,6 +43,7 @@ extern "C" {
 #include <stddef.h> /* for size_t */
 
 typedef size_t mem_size_t;
+#define MEM_SIZE_F SZT_F
 
 /* aliases for C library malloc() */
 #define mem_init()