moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Curl_select() now uses curl_socket_t on socket arguments

This commit is contained in:
Daniel Stenberg 2004-11-19 14:03:19 +00:00
parent cca9fca894
commit 765683403f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/select.c
View File

@ -36,7 +36,7 @@
#ifdef WIN32 #ifdef WIN32
#define VALID_SOCK(s) (1) /* Win-sockets are not in range [0..FD_SETSIZE> */ #define VALID_SOCK(s) (1) /* Win-sockets are not in range [0..FD_SETSIZE> */
#else #else
#define VALID_SOCK(s) ((s) >= 0) && ((s) < FD_SETSIZE)) #define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE))
#endif #endif
/* /*
@ -49,7 +49,7 @@
* 0 = timeout * 0 = timeout
* CSELECT_IN | CSELECT_OUT | CSELECT_ERR * CSELECT_IN | CSELECT_OUT | CSELECT_ERR
*/ */
int Curl_select(int readfd, int writefd, int timeout_ms) int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
{ {
#ifdef HAVE_POLL_FINE #ifdef HAVE_POLL_FINE
struct pollfd pfd[2]; struct pollfd pfd[2];

4
lib/select.h
View File

@ -23,7 +23,6 @@
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
#include <sys/poll.h> #include <sys/poll.h>
#else #else
@ -44,12 +43,11 @@ struct pollfd
#endif #endif
#define CSELECT_IN 0x01 #define CSELECT_IN 0x01
#define CSELECT_OUT 0x02 #define CSELECT_OUT 0x02
#define CSELECT_ERR 0x04 #define CSELECT_ERR 0x04
int Curl_select(int readfd, int writefd, int timeout_ms); int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms);
int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms); int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);