abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-15 20:56:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

* mem.c, stats.c, mem.h: apply patch #6414 to avoid compiler errors

Browse Source 
and/or warnings on some systems where mem_size_t and size_t differ.
This commit is contained in:
jifl
2008-03-04 16:31:31 +00:00
parent 2637f2ad3a
commit 30d4c243ec
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/include/lwip/mem.h
View File

@@ -38,18 +38,12 @@
extern "C" {
#endif
/* MEM_SIZE would have to be aligned, but using 64000 here instead of
* 65535 leaves some room for alignment...
*/
#if MEM_SIZE > 64000l
typedef u32_t mem_size_t;
#define MEM_SIZE_F U32_F
#else
typedef u16_t mem_size_t;
#define MEM_SIZE_F U16_F
#endif /* MEM_SIZE > 64000 */
#if MEM_LIBC_MALLOC
#include <stddef.h> /* for size_t */
typedef size_t mem_size_t;
/* aliases for C library malloc() */
#define mem_init()
/* in case C library malloc() needs extra protection,
@@ -68,6 +62,16 @@ typedef u16_t mem_size_t;
#define mem_realloc(x, size) (x)
#endif
#else /* MEM_LIBC_MALLOC */
/* MEM_SIZE would have to be aligned, but using 64000 here instead of
* 65535 leaves some room for alignment...
*/
#if MEM_SIZE > 64000l
typedef u32_t mem_size_t;
#else
typedef u16_t mem_size_t;
#endif /* MEM_SIZE > 64000 */
#if MEM_USE_POOLS
/** mem_init is not used when using pools instead of a heap */
#define mem_init()
@@ -80,7 +84,7 @@ void mem_init(void);
void *mem_realloc(void *mem, mem_size_t size);
#endif /* MEM_USE_POOLS */
void *mem_malloc(mem_size_t size);
void *mem_calloc(size_t count, size_t size);
void *mem_calloc(mem_size_t count, mem_size_t size);
void mem_free(void *mem);
#endif /* MEM_LIBC_MALLOC */