[rtems-lwip commit] lwip/sockets.h: Avoid duplication of system struct

Joel Sherrill joel at rtems.org
Wed Mar 8 20:41:28 UTC 2023


Module:    rtems-lwip
Branch:    master
Commit:    cd9d9e7b40c5aed4744dc4f9e0e287d06e9efdd2
Changeset: http://git.rtems.org/rtems-lwip/commit/?id=cd9d9e7b40c5aed4744dc4f9e0e287d06e9efdd2

Author:    Kinsey Moore <kinsey.moore at oarcorp.com>
Date:      Wed Feb 22 16:46:07 2023 -0600

lwip/sockets.h: Avoid duplication of system struct

Excise another portion of lwIP's headers that redefine structures
available from toolchain headers.

---

 lwip/src/include/lwip/sockets.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lwip/src/include/lwip/sockets.h b/lwip/src/include/lwip/sockets.h
index 705ae46..3f7ee32 100644
--- a/lwip/src/include/lwip/sockets.h
+++ b/lwip/src/include/lwip/sockets.h
@@ -85,6 +85,7 @@ typedef u16_t in_port_t;
 
 #ifdef __rtems__
 #include <netinet/in.h>
+#include <net/if.h>
 #define SIN_ZERO_LEN 8
 #else
 #if LWIP_IPV4
@@ -201,14 +202,12 @@ will need to increase long long */
 #define CMSG_LEN(length) (ALIGN_D(sizeof(struct cmsghdr)) + \
                            length)
 
-#endif /* __rtems__ */
 /* Set socket options argument */
 #define IFNAMSIZ NETIF_NAMESIZE
 struct ifreq {
   char ifr_name[IFNAMSIZ]; /* Interface name */
 };
 
-#ifndef __rtems__
 /* Socket protocol types (TCP/UDP/RAW) */
 #define SOCK_STREAM     1
 #define SOCK_DGRAM      2



More information about the vc mailing list