[PATCH rtems-lwip 1/3] lwip/sockets.h: Avoid duplication of system struct

Kinsey Moore kinsey.moore at oarcorp.com
Thu Mar 2 22:59:42 UTC 2023


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
-- 
2.30.2



More information about the devel mailing list