fix memp.c compiling error when DEBUG option is open.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@315 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
parent
4c56e26952
commit
b8677f4462
|
@ -126,14 +126,6 @@ const u16_t memp_sizes[MEMP_MAX] = {
|
||||||
#include "lwip/memp_std.h"
|
#include "lwip/memp_std.h"
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !MEMP_MEM_MALLOC /* don't build if not configured for use in lwipopts.h */
|
|
||||||
|
|
||||||
/** This array holds the number of elements in each pool. */
|
|
||||||
static const u16_t memp_num[MEMP_MAX] = {
|
|
||||||
#define LWIP_MEMPOOL(name,num,size,desc) (num),
|
|
||||||
#include "lwip/memp_std.h"
|
|
||||||
};
|
|
||||||
|
|
||||||
/** This array holds a textual description of each pool. */
|
/** This array holds a textual description of each pool. */
|
||||||
#ifdef LWIP_DEBUG
|
#ifdef LWIP_DEBUG
|
||||||
static const char *memp_desc[MEMP_MAX] = {
|
static const char *memp_desc[MEMP_MAX] = {
|
||||||
|
@ -142,6 +134,14 @@ static const char *memp_desc[MEMP_MAX] = {
|
||||||
};
|
};
|
||||||
#endif /* LWIP_DEBUG */
|
#endif /* LWIP_DEBUG */
|
||||||
|
|
||||||
|
#if !MEMP_MEM_MALLOC /* don't build if not configured for use in lwipopts.h */
|
||||||
|
|
||||||
|
/** This array holds the number of elements in each pool. */
|
||||||
|
static const u16_t memp_num[MEMP_MAX] = {
|
||||||
|
#define LWIP_MEMPOOL(name,num,size,desc) (num),
|
||||||
|
#include "lwip/memp_std.h"
|
||||||
|
};
|
||||||
|
|
||||||
/** This is the actual memory used by the pools. */
|
/** This is the actual memory used by the pools. */
|
||||||
static u8_t memp_memory[MEM_ALIGNMENT - 1
|
static u8_t memp_memory[MEM_ALIGNMENT - 1
|
||||||
#define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) )
|
#define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) )
|
||||||
|
|
Loading…
Reference in New Issue