len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update the FreeTCPIP files such that Keil is happy compiling them with the pack struct header file definitions.

Browse source
This commit is contained in:
Richard Barry 2011-04-28 19:38:32 +00:00
parent 44fc593dfe
commit 96b1dc773f
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
View file

@ -26,3 +26,8 @@
; ;
#pragma pack() #pragma pack()
#endif #endif
#ifdef __CC_ARM
;
#endif

5
Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h
View file

@ -27,3 +27,8 @@
#ifdef __ICCARM__ #ifdef __ICCARM__
#pragma pack(1) #pragma pack(1)
#endif #endif
#ifdef __CC_ARM
__packed
#endif

14
Demo/Common/ethernet/FreeTCPIP/net/uip.h
View file

@ -69,12 +69,14 @@
typedef uip_ip6addr_t uip_ipaddr_t; typedef uip_ip6addr_t uip_ipaddr_t;
#else /* UIP_CONF_IPV6 */ #else /* UIP_CONF_IPV6 */
typedef union uip_ip4addr_t #include "pack_struct_start.h"
{ typedef union uip_ip4addr_t
u8_t u8[4]; /* Initializer, must come first!!! */ {
u16_t u16[2]; u8_t u8[4]; /* Initializer, must come first!!! */
} uip_ip4addr_t; u16_t u16[2];
typedef uip_ip4addr_t uip_ipaddr_t; } uip_ip4addr_t;
typedef uip_ip4addr_t uip_ipaddr_t
#include "pack_struct_end.h"
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/