fixed bug #36412: memp.c does not compile when MEMP_OVERFLOW_CHECK > zero and MEMP_SE...

diff --git a/CHANGELOG b/CHANGELOG
index 64350e9adfa10f2cf8a4b269964acb47e1fdd320..dbed662eccea788c2f7386c7ac758d1bcae49af0 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,8 +80,12 @@ HISTORY
 
  ++ Bugfixes:
 
+  2012-05-11: Simon Goldschmidt (patch by Marty)
+  * memp.c: fixed bug #36412: memp.c does not compile when
+    MEMP_OVERFLOW_CHECK > zero and MEMP_SEPARATE_POOLS == 1
+
   2012-05-08: Simon Goldschmidt
-  * tcp_out.c: fixed bug: #36380 unsent_oversize mismatch in 1.4.1RC1 (this was
+  * tcp_out.c: fixed bug #36380: unsent_oversize mismatch in 1.4.1RC1 (this was
     a debug-check issue only)
 
   2012-05-03: Simon Goldschmidt (patch by Sylvain Rochet)

diff --git a/src/core/memp.c b/src/core/memp.c
index bfe6ee60568e1a67bef5fc1b3fbb39eeb45e11a7..3496f682e4566c811a85f5e3c08b8196db0298a1 100644 (file)
--- a/src/core/memp.c
+++ b/src/core/memp.c
@@ -285,17 +285,25 @@ memp_overflow_check_all(void)
   u16_t i, j;
   struct memp *p;
 
+#if !MEMP_SEPARATE_POOLS
   p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+#endif /* !MEMP_SEPARATE_POOLS */
   for (i = 0; i < MEMP_MAX; ++i) {
-    p = p;
+#if MEMP_SEPARATE_POOLS
+    p = (struct memp *)(memp_bases[i]);
+#endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {
       memp_overflow_check_element_overflow(p, i);
       p = (struct memp*)((u8_t*)p + MEMP_SIZE + memp_sizes[i] + MEMP_SANITY_REGION_AFTER_ALIGNED);
     }
   }
+#if !MEMP_SEPARATE_POOLS
   p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+#endif /* !MEMP_SEPARATE_POOLS */
   for (i = 0; i < MEMP_MAX; ++i) {
-    p = p;
+#if MEMP_SEPARATE_POOLS
+    p = (struct memp *)(memp_bases[i]);
+#endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {
       memp_overflow_check_element_underflow(p, i);
       p = (struct memp*)((u8_t*)p + MEMP_SIZE + memp_sizes[i] + MEMP_SANITY_REGION_AFTER_ALIGNED);
@@ -313,9 +321,13 @@ memp_overflow_init(void)
   struct memp *p;
   u8_t *m;
 
+#if !MEMP_SEPARATE_POOLS
   p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+#endif /* !MEMP_SEPARATE_POOLS */
   for (i = 0; i < MEMP_MAX; ++i) {
-    p = p;
+#if MEMP_SEPARATE_POOLS
+    p = (struct memp *)(memp_bases[i]);
+#endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {
 #if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0
       m = (u8_t*)p + MEMP_SIZE - MEMP_SANITY_REGION_BEFORE_ALIGNED;