From d400f77dea613445760dcb97924865e15c00b19f Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 2 Jul 2003 17:09:28 +0000 Subject: [PATCH] Wrapping MEM_ALIGN macros in #ifndef --- src/include/lwip/mem.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h index f1ca270d..f9607dcf 100644 --- a/src/include/lwip/mem.h +++ b/src/include/lwip/mem.h @@ -49,9 +49,13 @@ void mem_free(void *mem); void *mem_realloc(void *mem, mem_size_t size); void *mem_reallocm(void *mem, mem_size_t size); +#ifndef MEM_ALIGN_SIZE #define MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1)) +#endif +#ifndef MEM_ALIGN #define MEM_ALIGN(addr) ((void *)(((mem_ptr_t)(addr) + MEM_ALIGNMENT - 1) & ~(mem_ptr_t)(MEM_ALIGNMENT-1))) +#endif #endif /* __LWIP_MEM_H__ */