mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
move FD_SET defines to sockets.h from arch.h .Last arg of select is not a const according to linux and openBSD manpages
This commit is contained in:
parent
90bc698a40
commit
da40fbd054
@ -646,7 +646,7 @@ lwip_selscan(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset)
|
|||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
int
|
int
|
||||||
lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
|
lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
|
||||||
const struct timeval *timeout)
|
struct timeval *timeout)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int nready;
|
int nready;
|
||||||
|
@ -54,24 +54,6 @@
|
|||||||
#define PACK_STRUCT_FIELD(x) x
|
#define PACK_STRUCT_FIELD(x) x
|
||||||
#endif /* PACK_STRUCT_FIELD */
|
#endif /* PACK_STRUCT_FIELD */
|
||||||
|
|
||||||
#ifndef FD_SET
|
|
||||||
#undef FD_SETSIZE
|
|
||||||
#define FD_SETSIZE 16
|
|
||||||
#define FD_SET(n, p) ((p)->fd_bits[(n)/8] |= (1 << ((n) & 7)))
|
|
||||||
#define FD_CLR(n, p) ((p)->fd_bits[(n)/8] &= ~(1 << ((n) & 7)))
|
|
||||||
#define FD_ISSET(n,p) ((p)->fd_bits[(n)/8] & (1 << ((n) & 7)))
|
|
||||||
#define FD_ZERO(p) memset((void*)(p),0,sizeof(*(p)))
|
|
||||||
|
|
||||||
typedef struct fd_set {
|
|
||||||
unsigned char fd_bits [(FD_SETSIZE+7)/8];
|
|
||||||
} fd_set;
|
|
||||||
|
|
||||||
struct timeval {
|
|
||||||
long tv_sec; /* seconds */
|
|
||||||
long tv_usec; /* and microseconds */
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef LWIP_PROVIDE_ERRNO
|
#ifdef LWIP_PROVIDE_ERRNO
|
||||||
|
@ -164,6 +164,25 @@ struct linger {
|
|||||||
#define O_NONBLOCK 04000
|
#define O_NONBLOCK 04000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef FD_SET
|
||||||
|
#undef FD_SETSIZE
|
||||||
|
#define FD_SETSIZE 16
|
||||||
|
#define FD_SET(n, p) ((p)->fd_bits[(n)/8] |= (1 << ((n) & 7)))
|
||||||
|
#define FD_CLR(n, p) ((p)->fd_bits[(n)/8] &= ~(1 << ((n) & 7)))
|
||||||
|
#define FD_ISSET(n,p) ((p)->fd_bits[(n)/8] & (1 << ((n) & 7)))
|
||||||
|
#define FD_ZERO(p) memset((void*)(p),0,sizeof(*(p)))
|
||||||
|
|
||||||
|
typedef struct fd_set {
|
||||||
|
unsigned char fd_bits [(FD_SETSIZE+7)/8];
|
||||||
|
} fd_set;
|
||||||
|
|
||||||
|
struct timeval {
|
||||||
|
long tv_sec; /* seconds */
|
||||||
|
long tv_usec; /* and microseconds */
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
int lwip_accept(int s, struct sockaddr *addr, int *addrlen);
|
int lwip_accept(int s, struct sockaddr *addr, int *addrlen);
|
||||||
int lwip_bind(int s, struct sockaddr *name, int namelen);
|
int lwip_bind(int s, struct sockaddr *name, int namelen);
|
||||||
int lwip_shutdown(int s, int how);
|
int lwip_shutdown(int s, int how);
|
||||||
@ -184,7 +203,7 @@ int lwip_sendto(int s, void *dataptr, int size, unsigned int flags,
|
|||||||
int lwip_socket(int domain, int type, int protocol);
|
int lwip_socket(int domain, int type, int protocol);
|
||||||
int lwip_write(int s, void *dataptr, int size);
|
int lwip_write(int s, void *dataptr, int size);
|
||||||
int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
|
int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
|
||||||
const struct timeval *timeout);
|
struct timeval *timeout);
|
||||||
int lwip_ioctl(int s, long cmd, void *argp);
|
int lwip_ioctl(int s, long cmd, void *argp);
|
||||||
|
|
||||||
#ifdef LWIP_COMPAT_SOCKETS
|
#ifdef LWIP_COMPAT_SOCKETS
|
||||||
|
Loading…
Reference in New Issue
Block a user