From b939e9536d8a3e8177b5b76bd307bcb682047a96 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Thu, 7 Jul 2016 22:05:30 +0200
Subject: [PATCH] Minor: move some macros from memp.h to memp_priv.h

---
 src/include/lwip/memp.h           |  8 --------
 src/include/lwip/priv/memp_priv.h | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h
index 953121f4..603c2264 100644
--- a/src/include/lwip/memp.h
+++ b/src/include/lwip/memp.h
@@ -69,14 +69,6 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX];
 
 #define LWIP_MEMPOOL_PROTOTYPE(name) extern const struct memp_desc memp_ ## name
 
-#if MEMP_STATS
-#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name) static struct stats_mem name;
-#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name) &name,
-#else
-#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name)
-#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name)
-#endif
-
 #if MEMP_MEM_MALLOC
 
 #include "lwip/mem.h"
diff --git a/src/include/lwip/priv/memp_priv.h b/src/include/lwip/priv/memp_priv.h
index c77c08ca..b82350e4 100644
--- a/src/include/lwip/priv/memp_priv.h
+++ b/src/include/lwip/priv/memp_priv.h
@@ -124,11 +124,13 @@ typedef enum {
 #define MEMP_POOL_LAST   ((memp_t) MEMP_POOL_HELPER_LAST)
 #endif /* MEM_USE_POOLS */
 
+/** Memory pool descriptor */
 struct memp_desc {
   /** Element size */
   u16_t size;
 
 #if MEMP_STATS
+  /** Statistics */
   struct stats_mem *stats;
 #endif
 
@@ -141,7 +143,7 @@ struct memp_desc {
   const char *desc;
 #endif /* LWIP_DEBUG || MEMP_OVERFLOW_CHECK */
 
-  /** Base */
+  /** Base address */
   u8_t *base;  
 
   /** First free element of each pool. Elements form a linked list. */
@@ -155,6 +157,14 @@ struct memp_desc {
 #define DECLARE_LWIP_MEMPOOL_DESC(desc)
 #endif
 
+#if MEMP_STATS
+#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name) static struct stats_mem name;
+#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name) &name,
+#else
+#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name)
+#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name)
+#endif
+
 void memp_init_pool(const struct memp_desc *desc);
 
 #if MEMP_OVERFLOW_CHECK