Update the FreeTCPIP files such that Keil is happy compiling them with the pack struc...

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 8a5951fca7b10266213a27d59214ef3c7ee3f6b7..a23febe4df1da888c557d6fb157d24dca49f6b41 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
@@ -26,3 +26,8 @@
        ;\r
        #pragma pack()\r
 #endif\r
+\r
+\r
+#ifdef __CC_ARM\r
+       ;\r
+#endif\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h
index efa41a0a4df737ed30dc134b6c431079541801b0..49a4dc9f61ea8f9688618a08a84926f08cd5a64e 100644 (file)
--- 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__\r
        #pragma pack(1)\r
 #endif\r
+\r
+#ifdef __CC_ARM\r
+       __packed\r
+#endif\r
+\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip.h b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
index 00ae035a64f8cc4c324bb67861a2fe4219be563c..3cfad7bef01a13e50447e241cf0b111140aa623d 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/net/uip.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
@@ -69,12 +69,14 @@
 \r
        typedef uip_ip6addr_t   uip_ipaddr_t;\r
 #else /* UIP_CONF_IPV6 */\r
-       typedef union                   uip_ip4addr_t\r
-       {\r
-               u8_t    u8[4];  /* Initializer, must come first!!! */\r
-               u16_t   u16[2];\r
-       } uip_ip4addr_t;\r
-       typedef uip_ip4addr_t   uip_ipaddr_t;\r
+       #include "pack_struct_start.h"\r
+               typedef union                   uip_ip4addr_t\r
+               {\r
+                       u8_t    u8[4];  /* Initializer, must come first!!! */\r
+                       u16_t   u16[2];\r
+               } uip_ip4addr_t;\r
+               typedef uip_ip4addr_t   uip_ipaddr_t\r
+       #include "pack_struct_end.h"\r
 #endif /* UIP_CONF_IPV6 */\r
 \r
 /*---------------------------------------------------------------------------*/\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h b/Demo/Common/ethernet/FreeTCPIP/net/uip_arp.h
index 6aec6ad7d7a4fcc0418c3164f34b2a5a8b734222..e04d353053f71f8e31b50a32e9c5d9abc3f9c44c 100644 (file)
--- 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__ */\r
 \r
        /** @} */\r
-       
\ No newline at end of file
+       \r