Update the FreeTCPIP files such that Keil is happy compiling them with the pack struct header file definitions.
This commit is contained in:
parent
44fc593dfe
commit
96b1dc773f
@ -26,3 +26,8 @@
|
||||
;
|
||||
#pragma pack()
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __CC_ARM
|
||||
;
|
||||
#endif
|
||||
|
@ -27,3 +27,8 @@
|
||||
#ifdef __ICCARM__
|
||||
#pragma pack(1)
|
||||
#endif
|
||||
|
||||
#ifdef __CC_ARM
|
||||
__packed
|
||||
#endif
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
@ -146,4 +146,4 @@ void uip_arp_timer( void );
|
||||
#endif /* __UIP_ARP_H__ */
|
||||
|
||||
/** @} */
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user