libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[components][lwip]fix lwip poll macro conflict

This commit is contained in:
zms123456 2024-09-14 05:29:08 +08:00 committed by GitHub
parent 6d39cdf836
commit f2dc4f13cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/net/lwip/lwip-2.1.2/src/include/lwip/sockets.h
View File

@ -495,6 +495,18 @@ typedef struct fd_set
/* poll-related defines and types */ /* poll-related defines and types */
/* @todo: find a better way to guard the definition of these defines and types if already defined */ /* @todo: find a better way to guard the definition of these defines and types if already defined */
#if !defined(POLLIN) && !defined(POLLOUT) #if !defined(POLLIN) && !defined(POLLOUT)
#ifdef RT_USING_MUSLLIBC
#define POLLIN 0x001 /**< There is data to read. */
#define POLLPRI 0x002 /**< There is urgent data to read. */
#define POLLOUT 0x004 /**< Writing is now possible. */
#define POLLERR 0x008 /**< Error condition. */
#define POLLHUP 0x010 /**< Hang up. */
#define POLLNVAL 0x020 /**< Invalid polling request. */
#define POLLRDNORM 0x040 /**< Normal data may be read. */
#define POLLRDBAND 0x080 /**< Priority data may be read. */
#define POLLWRNORM 0x100 /**< Writing normal data is possible. */
#define POLLWRBAND 0x200 /**< Writing priority data is possible. */
#else
#define POLLIN 0x1 #define POLLIN 0x1
#define POLLOUT 0x2 #define POLLOUT 0x2
#define POLLERR 0x4 #define POLLERR 0x4
@ -506,6 +518,7 @@ typedef struct fd_set
#define POLLWRNORM 0x80 #define POLLWRNORM 0x80
#define POLLWRBAND 0x100 #define POLLWRBAND 0x100
#define POLLHUP 0x200 #define POLLHUP 0x200
#endif /* RT_USING_MUSLLIBC */
typedef unsigned int nfds_t; typedef unsigned int nfds_t;
struct pollfd struct pollfd
{ {

8
components/net/sal/impl/af_inet_lwip.c
View File

@ -10,16 +10,16 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef SAL_USING_POSIX
#include <poll.h>
#endif
#include <lwip/sockets.h> #include <lwip/sockets.h>
#include <lwip/netdb.h> #include <lwip/netdb.h>
#include <lwip/api.h> #include <lwip/api.h>
#include <lwip/init.h> #include <lwip/init.h>
#include <lwip/netif.h> #include <lwip/netif.h>
#ifdef SAL_USING_POSIX
#include <poll.h>
#endif
#include <sal_low_lvl.h> #include <sal_low_lvl.h>
#include <af_inet.h> #include <af_inet.h>