Commit 76568340 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Curl_select() now uses curl_socket_t on socket arguments

parent cca9fca8

lib/select.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#ifdef WIN32

#define VALID_SOCK(s) (1)  /* Win-sockets are not in range [0..FD_SETSIZE> */

#else

#define VALID_SOCK(s) ((s) >= 0) && ((s) < FD_SETSIZE))

#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE))

#endif



/*
@@ -49,7 +49,7 @@ 
 *    0 = timeout

 *    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

  struct pollfd pfd[2];

lib/select.h

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 * $Id$

 ***************************************************************************/





#ifdef HAVE_SYS_POLL_H

#include <sys/poll.h>

#else
@@ -44,12 +43,11 @@ struct pollfd 


#endif





#define CSELECT_IN   0x01

#define CSELECT_OUT  0x02

#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);