Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-05 09:29:39 +00:00
Code Issues Projects Releases Wiki Activity

Reverted part of recent change. The 32-bit member causes 32-bit alignment on 32-bit machines - at least without specific compiler options. That 32-bit alignment causes padding i.e. the ARP structure breaking the existing code.

Browse Source
This commit is contained in:
oliverschmidt 2008-02-09 16:22:22 +00:00
parent 518a84fc66
commit 081d50b878
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/net/uip.h
View File

@ -46,7 +46,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip.h,v 1.15 2008/02/07 01:35:00 adamdunkels Exp $ * $Id: uip.h,v 1.16 2008/02/09 16:22:22 oliverschmidt Exp $
* *
*/ */
@ -62,7 +62,9 @@
typedef union uip_ip4addr_t { typedef union uip_ip4addr_t {
u8_t u8[4]; /* Initializer, must come first!!! */ u8_t u8[4]; /* Initializer, must come first!!! */
u16_t u16[2]; u16_t u16[2];
u32_t u32[1]; #if 0
u32_t u32[1]; /* Might cause 32-bit alignment !!! */
#endif
} uip_ip4addr_t; } uip_ip4addr_t;
typedef union uip_ip6addr_t { typedef union uip_ip6addr_t {