Changeset 85319 in vbox

Timestamp:

Jul 13, 2020 9:18:40 PM (4 years ago)

Author:

vboxsync

Message:

lwip/icmp*.h: Clang 11 workaround. bugref:9790

Location:

trunk/src/VBox/Devices/Network/lwip-new/src/include

Files:

• ipv4/lwip/icmp.h (modified) (2 diffs)
• ipv6/lwip/icmp6.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv4/lwip/icmp.h

@@ -82 +82 @@
  *  use the data part.
  */
+#ifdef VBOX /* Clang 11 takes offence when member addresses are taken (id).  Packing not needed, so just dispense with it. */
+struct icmp_echo_hdr {
+  u8_t type;
+  u8_t code;
+  u16_t chksum;
+  u16_t id;
+  u16_t seqno;
+};
+AssertCompileSize(struct icmp_echo_hdr, sizeof(uint32_t)*2);
+#else
 PACK_STRUCT_BEGIN
 struct icmp_echo_hdr {
@@ -94 +104 @@
 #  include "arch/epstruct.h"
 #endif
+#endif /* VBOX */
 
 #define ICMPH_TYPE(hdr) ((hdr)->type)

trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv6/lwip/icmp6.h

@@ -117 +117 @@
 
 /** This is the ICMP6 header adapted for echo req/resp. */
+#ifdef VBOX /* Clang 11 takes offence when member addresses are taken (id).  Packing not needed, so just dispense with it. */
+struct icmp6_echo_hdr {
+  u8_t type;
+  u8_t code;
+  u16_t chksum;
+  u16_t id;
+  u16_t seqno;
+};
+AssertCompileSize(struct icmp6_echo_hdr, sizeof(uint32_t) * 2);
+#else
 #ifdef PACK_STRUCT_USE_INCLUDES
 #  include "arch/bpstruct.h"
@@ -132 +142 @@
 #  include "arch/epstruct.h"
 #endif
+#endif /* VBOX */