Added extra compiler specific structure packing options.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@476 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/icmp.h b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/icmp.h
index 6b34c88f68266988fc9ffe41cc36ddbbab926784..39835cbb0f9654faa6f06cce41c142aa581c8bc1 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/icmp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/icmp.h
@@ -79,6 +79,9 @@ void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct icmp_echo_hdr {\r
   PACK_STRUCT_FIELD(u16_t _type_code);\r
   PACK_STRUCT_FIELD(u16_t chksum);\r
@@ -88,6 +91,9 @@ struct icmp_echo_hdr {
 PACK_STRUCT_END\r
 \r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct icmp_dur_hdr {\r
   PACK_STRUCT_FIELD(u16_t _type_code);\r
   PACK_STRUCT_FIELD(u16_t chksum);\r
@@ -96,6 +102,9 @@ struct icmp_dur_hdr {
 PACK_STRUCT_END\r
 \r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct icmp_te_hdr {\r
   PACK_STRUCT_FIELD(u16_t _type_code);\r
   PACK_STRUCT_FIELD(u16_t chksum);\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/igmp.h b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/igmp.h
index 1b4c457c2bf197ee61008ca8d833e48d103dca38..f942209ab43b78a9733d93253fe4c1c6d40e33ce 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/igmp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/igmp.h
@@ -84,6 +84,9 @@ extern "C" {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct igmp_msg {\r
  PACK_STRUCT_FIELD(u8_t           igmp_msgtype);\r
  PACK_STRUCT_FIELD(u8_t           igmp_maxresp);\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip.h b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip.h
index fa2f149c8f4f345414a9a757eedec6e3c6349c06..946837d2043b95e35f7a2be17f59496d4b6a8394 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip.h
@@ -114,6 +114,9 @@ struct ip_pcb {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct ip_hdr {\r
   /* version / header length / type of service */\r
   PACK_STRUCT_FIELD(u16_t _v_hl_tos);\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip_addr.h b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip_addr.h
index 6b53968d076a4bc73ba1d6ca94d7b50e0cc44d26..acc51e38b9381865e112f05f0415232c12116e43 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip_addr.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/ipv4/lwip/ip_addr.h
@@ -42,6 +42,9 @@ extern "C" {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct ip_addr {\r
   PACK_STRUCT_FIELD(u32_t addr);\r
 } PACK_STRUCT_STRUCT;\r
@@ -58,6 +61,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct ip_addr2 {\r
   PACK_STRUCT_FIELD(u16_t addrw[2]);\r
 } PACK_STRUCT_STRUCT;\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/ipv6/lwip/ip_addr.h b/Demo/Common/ethernet/lwIP_130/src/include/ipv6/lwip/ip_addr.h
index 85971c94c474aa17a2dea364c0a4591fede06786..6aeba20aead43975698e611f95d7af1133b571a3 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/ipv6/lwip/ip_addr.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/ipv6/lwip/ip_addr.h
@@ -44,6 +44,9 @@ extern "C" {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
  struct ip_addr {\r
   PACK_STRUCT_FIELD(u32_t addr[4]);\r
 } PACK_STRUCT_STRUCT;\r
@@ -60,6 +63,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct ip_addr2 {\r
   PACK_STRUCT_FIELD(u16_t addrw[2]);\r
 } PACK_STRUCT_STRUCT;\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/lwip/dhcp.h b/Demo/Common/ethernet/lwIP_130/src/include/lwip/dhcp.h
index 3795d6e75bef2fd0c30d24e3f46b116a5872efac..164469053f779a48d84992a28b09ceefd744c1ca 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/lwip/dhcp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/lwip/dhcp.h
@@ -76,6 +76,9 @@ struct dhcp
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 /** minimum set of fields of any DHCP message */\r
 struct dhcp_msg\r
 {\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/lwip/tcp.h b/Demo/Common/ethernet/lwIP_130/src/include/lwip/tcp.h
index efef3df3921c94c865359f14bcdbf4e5cfbb3fc4..9912be084b36b71d389daf6f945fa5fa3b09083e 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/lwip/tcp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/lwip/tcp.h
@@ -210,6 +210,9 @@ void             tcp_rexmit_rto  (struct tcp_pcb *pcb);
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct tcp_hdr {\r
   PACK_STRUCT_FIELD(u16_t src);\r
   PACK_STRUCT_FIELD(u16_t dest);\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/lwip/udp.h b/Demo/Common/ethernet/lwIP_130/src/include/lwip/udp.h
index ed03a0d51bb2cf48c9562017c506a34da3fcc9ba..7cdcdfee730cd21452ea464448915c43d81ee76b 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/lwip/udp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/lwip/udp.h
@@ -52,6 +52,9 @@ extern "C" {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct udp_hdr {\r
   PACK_STRUCT_FIELD(u16_t src);\r
   PACK_STRUCT_FIELD(u16_t dest);  /* src/dest UDP ports */\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/netif/etharp.h b/Demo/Common/ethernet/lwIP_130/src/include/netif/etharp.h
index 021cffaec6e7691aac9131d0261f942892cbc558..3cea6ca3143e9849aa714915bb7fb2d8d0ac95d2 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/netif/etharp.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/netif/etharp.h
@@ -60,6 +60,9 @@ extern "C" {
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct eth_addr {\r
   PACK_STRUCT_FIELD(u8_t addr[ETHARP_HWADDR_LEN]);\r
 } PACK_STRUCT_STRUCT;\r
@@ -72,6 +75,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct eth_hdr {\r
 #if ETH_PAD_SIZE\r
   PACK_STRUCT_FIELD(u8_t padding[ETH_PAD_SIZE]);\r
@@ -89,6 +95,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 /** the ARP message */\r
 struct etharp_hdr {\r
   PACK_STRUCT_FIELD(struct eth_hdr ethhdr);\r
@@ -110,6 +119,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct ethip_hdr {\r
   PACK_STRUCT_FIELD(struct eth_hdr eth);\r
   PACK_STRUCT_FIELD(struct ip_hdr ip);\r

diff --git a/Demo/Common/ethernet/lwIP_130/src/include/netif/ppp_oe.h b/Demo/Common/ethernet/lwIP_130/src/include/netif/ppp_oe.h
index 8db61e5e7f0d29276d49b9a109506166ca157064..aa953820192b19a0660a87559dbb709d5e98315b 100644 (file)
--- a/Demo/Common/ethernet/lwIP_130/src/include/netif/ppp_oe.h
+++ b/Demo/Common/ethernet/lwIP_130/src/include/netif/ppp_oe.h
@@ -78,6 +78,9 @@
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct pppoehdr {\r
        PACK_STRUCT_FIELD(u8_t vertype);\r
        PACK_STRUCT_FIELD(u8_t code);\r
@@ -93,6 +96,9 @@ PACK_STRUCT_END
 #  include "arch/bpstruct.h"\r
 #endif\r
 PACK_STRUCT_BEGIN\r
+#if (defined(__MWERKS__)  || defined(__CWCC__))\r
+       #pragma options align= packed\r
+#endif\r
 struct pppoetag {\r
        PACK_STRUCT_FIELD(u16_t tag);\r
        PACK_STRUCT_FIELD(u16_t len);\r