Changeset 364 for asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/net/ethernet.h

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/net/ethernet.h (modified) (3 diffs)

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/net/ethernet.h

@@ -98 +98 @@
 #endif  /* of #ifndef IF_ETHER_NIC_HDR_ALIGN */
 
-#if defined(__RX) || defined(_MSC_VER)
 #if defined(__RX)
 #pragma pack
-#else
+#elif defined(_MSC_VER)
 #pragma pack(push, 1)
 #endif
+
+#if defined(__RX) || defined(_MSC_VER)
+
 typedef struct t_ether_header {
 
@@ -116 +118 @@
         uint16_t        type;
         } T_ETHER_HDR;
-#if defined(__RX)
-#pragma packoption
-#else
-#pragma pack(pop)
-#endif
 
 #elif defined(TOPPERS_S810_CLG3_85)     /* of #if defined(__RX) */
@@ -166 +163 @@
         uint8_t         lladdr[ETHER_ADDR_LEN];
         } __attribute__((packed, aligned(2))) T_ETHER_ADDR;
+
+#if defined(__RX)
+#pragma packoption
+#elif defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
 /*