Make the API more accessible by publishing constants
This commit is contained in:
parent
6bdb00e24c
commit
eda5e1902f
4 changed files with 21 additions and 10 deletions
|
@ -17,9 +17,6 @@
|
|||
#ifndef SOCKET_SELECT
|
||||
#include <sys/poll.h>
|
||||
|
||||
#define WAITFD_R POLLIN
|
||||
#define WAITFD_W POLLOUT
|
||||
#define WAITFD_C (POLLIN|POLLOUT)
|
||||
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
|
||||
int ret;
|
||||
struct pollfd pfd;
|
||||
|
@ -38,9 +35,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
|
|||
}
|
||||
#else
|
||||
|
||||
#define WAITFD_R 1
|
||||
#define WAITFD_W 2
|
||||
#define WAITFD_C (WAITFD_R|WAITFD_W)
|
||||
|
||||
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
|
||||
int ret;
|
||||
|
|
|
@ -56,4 +56,20 @@ typedef struct sockaddr_storage t_sockaddr_storage;
|
|||
|
||||
#define SOCKET_INVALID (-1)
|
||||
|
||||
#ifndef SOCKET_SELECT
|
||||
#include <sys/poll.h>
|
||||
|
||||
#define WAITFD_R POLLIN
|
||||
#define WAITFD_W POLLOUT
|
||||
#define WAITFD_C (POLLIN|POLLOUT)
|
||||
|
||||
#else
|
||||
|
||||
#define WAITFD_R 1
|
||||
#define WAITFD_W 2
|
||||
#define WAITFD_C (WAITFD_R|WAITFD_W)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* USOCKET_H */
|
||||
|
|
|
@ -39,10 +39,6 @@ int socket_close(void) {
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Wait for readable/writable/connected socket with timeout
|
||||
\*-------------------------------------------------------------------------*/
|
||||
#define WAITFD_R 1
|
||||
#define WAITFD_W 2
|
||||
#define WAITFD_E 4
|
||||
#define WAITFD_C (WAITFD_E|WAITFD_W)
|
||||
|
||||
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
|
||||
int ret;
|
||||
|
|
|
@ -30,4 +30,9 @@ typedef t_socket *p_socket;
|
|||
#define AI_NUMERICSERV (0)
|
||||
#endif
|
||||
|
||||
#define WAITFD_R 1
|
||||
#define WAITFD_W 2
|
||||
#define WAITFD_E 4
|
||||
#define WAITFD_C (WAITFD_E|WAITFD_W)
|
||||
|
||||
#endif /* WSOCKET_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue