diff options
4 files changed, 15 insertions, 4 deletions
diff --git a/components/libc/compilers/common/include/sys/ioctl.h b/components/libc/compilers/common/include/sys/ioctl.h index e33f19cd6f..ab0c069550 100644 --- a/components/libc/compilers/common/include/sys/ioctl.h +++ b/components/libc/compilers/common/include/sys/ioctl.h @@ -23,6 +23,9 @@ struct winsize unsigned short ws_ypixel; }; +#ifdef RT_USING_MUSLLIBC +#include <bits/ioctl.h> +#else /* * Direction bits, which any architecture can choose to override * before including this file. @@ -72,10 +75,6 @@ struct winsize #define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */ #endif -#ifndef FIONWRITE -#define FIONWRITE _IOR('f', 121, int) /* get # bytes outstanding in send queue */ -#endif - /* Socket I/O Controls */ #ifndef SIOCSHIWAT #define SIOCSHIWAT _IOW('s', 0, int) /* set high watermark */ @@ -206,6 +205,12 @@ struct winsize #define SIOCGSTAMP 0x8906 #define SIOCGSTAMPNS 0x8907 +#endif + +#ifndef FIONWRITE +#define FIONWRITE _IOR('f', 121, int) /* get # bytes outstanding in send queue */ +#endif + #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C #define SIOCRTMSG 0x890D diff --git a/components/net/lwip/lwip-1.4.1/src/include/lwip/sockets.h b/components/net/lwip/lwip-1.4.1/src/include/lwip/sockets.h index 3ea32f13fb..b7a8424b6a 100644 --- a/components/net/lwip/lwip-1.4.1/src/include/lwip/sockets.h +++ b/components/net/lwip/lwip-1.4.1/src/include/lwip/sockets.h @@ -261,6 +261,8 @@ typedef struct ip_mreq { #define SIOCGHIWAT _IOR('s', 1, unsigned long) /* get high watermark */ #define SIOCSLOWAT _IOW('s', 2, unsigned long) /* set low watermark */ #define SIOCGLOWAT _IOR('s', 3, unsigned long) /* get low watermark */ +#endif +#ifndef SIOCATMARK #define SIOCATMARK _IOR('s', 7, unsigned long) /* at oob mark? */ #endif diff --git a/components/net/lwip/lwip-2.0.3/src/include/lwip/sockets.h b/components/net/lwip/lwip-2.0.3/src/include/lwip/sockets.h index 2522056dba..ee04914811 100644 --- a/components/net/lwip/lwip-2.0.3/src/include/lwip/sockets.h +++ b/components/net/lwip/lwip-2.0.3/src/include/lwip/sockets.h @@ -378,6 +378,8 @@ typedef struct ip_mreq { #define SIOCGHIWAT _IOR('s', 1, unsigned long) /* get high watermark */ #define SIOCSLOWAT _IOW('s', 2, unsigned long) /* set low watermark */ #define SIOCGLOWAT _IOR('s', 3, unsigned long) /* get low watermark */ +#endif +#ifndef SIOCATMARK #define SIOCATMARK _IOR('s', 7, unsigned long) /* at oob mark? */ #endif diff --git a/components/net/lwip/lwip-2.1.2/src/include/lwip/sockets.h b/components/net/lwip/lwip-2.1.2/src/include/lwip/sockets.h index 12ffbddccc..335bee358d 100644 --- a/components/net/lwip/lwip-2.1.2/src/include/lwip/sockets.h +++ b/components/net/lwip/lwip-2.1.2/src/include/lwip/sockets.h @@ -427,6 +427,8 @@ typedef struct ipv6_mreq { #define SIOCGHIWAT _IOR('s', 1, unsigned long) /* get high watermark */ #define SIOCSLOWAT _IOW('s', 2, unsigned long) /* set low watermark */ #define SIOCGLOWAT _IOR('s', 3, unsigned long) /* get low watermark */ +#endif +#ifndef SIOCATMARK #define SIOCATMARK _IOR('s', 7, unsigned long) /* at oob mark? */ #endif |