From: richardbarry Date: Thu, 28 Apr 2011 19:38:32 +0000 (+0000) Subject: Update the FreeTCPIP files such that Keil is happy compiling them with the pack struc... X-Git-Tag: V7.0.1~25 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a82ed6090ae9aa3e1d98a17f138e4503ae8e13e;p=freertos Update the FreeTCPIP files such that Keil is happy compiling them with the pack struct header file definitions. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1399 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h index 8a5951fca..a23febe4d 100644 --- a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h +++ b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h @@ -26,3 +26,8 @@ ; #pragma pack() #endif + + +#ifdef __CC_ARM + ; +#endif diff --git a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h index efa41a0a4..49a4dc9f6 100644 --- a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h +++ b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h @@ -27,3 +27,8 @@ #ifdef __ICCARM__ #pragma pack(1) #endif + +#ifdef __CC_ARM + __packed +#endif + diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip.h b/Demo/Common/ethernet/FreeTCPIP/net/uip.h index 00ae035a6..3cfad7bef 100644 --- a/Demo/Common/ethernet/FreeTCPIP/net/uip.h +++ b/Demo/Common/ethernet/FreeTCPIP/net/uip.h @@ -69,12 +69,14 @@ typedef uip_ip6addr_t uip_ipaddr_t; #else /* UIP_CONF_IPV6 */ - typedef union uip_ip4addr_t - { - u8_t u8[4]; /* Initializer, must come first!!! */ - u16_t u16[2]; - } uip_ip4addr_t; - typedef uip_ip4addr_t uip_ipaddr_t; + #include "pack_struct_start.h" + typedef union uip_ip4addr_t + { + u8_t u8[4]; /* Initializer, must come first!!! */ + u16_t u16[2]; + } uip_ip4addr_t; + typedef uip_ip4addr_t uip_ipaddr_t + #include "pack_struct_end.h" #endif /* UIP_CONF_IPV6 */ /*---------------------------------------------------------------------------*/ diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h b/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h index 6aec6ad7d..e04d35305 100644 --- a/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h +++ b/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h @@ -146,4 +146,4 @@ void uip_arp_timer( void ); #endif /* __UIP_ARP_H__ */ /** @} */ - \ No newline at end of file +