Merged from DEVEL into main tree.

[pes-rpp/rpp-lwip.git] / src / include / lwip / mem.h

diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index f1ca270d3d6fd86c222647b4bf9fe7b0f3b93296..f9607dcfa2444016e2f261daed39ba1082dc652e 100644 (file)
--- 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__ */