abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 09:03:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt.h, mem.h, mem.c, memp.c, pbuf.c, ip_frag.c, vj.c: Fix bug #20162. Rename MEM_ALIGN in LWIP_MEM_ALIGN and MEM_ALIGN_SIZE in LWIP_MEM_ALIGN_SIZE to avoid some macro names collision with some OS macros.

Browse Source
This commit is contained in:
fbernon
2007-06-13 17:17:26 +00:00
parent 5f7831b3c8
commit bdbc96f453
8 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ipv4/ip_frag.c
View File

@@ -311,7 +311,7 @@ nullreturn:
#if IP_FRAG
#if IP_FRAG_USES_STATIC_BUF
static u8_t buf[MEM_ALIGN_SIZE(IP_FRAG_MAX_MTU)];
static u8_t buf[LWIP_MEM_ALIGN_SIZE(IP_FRAG_MAX_MTU)];
#endif /* IP_FRAG_USES_STATIC_BUF */
/**
@@ -361,7 +361,7 @@ ip_frag(struct pbuf *p, struct netif *netif, struct ip_addr *dest)
return ERR_MEM;
}
rambuf->tot_len = rambuf->len = mtu;
rambuf->payload = MEM_ALIGN((void *)buf);
rambuf->payload = LWIP_MEM_ALIGN((void *)buf);
/* Copy the IP header in it */
iphdr = rambuf->payload;