From: Simon Goldschmidt <goldsimon@gmx.de>
Date: Sat, 24 Sep 2011 11:59:33 +0000 (+0200)
Subject: fixed bug #34377 MEM_SIZE_F is not defined if MEM_LIBC_MALLOC==1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-lwip.git/commitdiff_plain/6c56151d27dc619e4139303a5ac5aee0f0c0e451

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

diff --git a/CHANGELOG b/CHANGELOG
index df44d8d4..d2c15bf3 100644
--- 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 9507c0ae..5bb906b6 100644
--- 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()