1
0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 22:15:13 -05:00

Added some #ifdefs around header files and change the EAGAIN test to

fix compilation on Cell (reported by Jeff Curley).
This commit is contained in:
Dan Fandrich 2008-11-14 23:17:32 +00:00
parent 9b033e1b8a
commit ea8fbb5233
7 changed files with 16 additions and 1 deletions

View File

@ -10,6 +10,9 @@ Daniel Fandrich (14 Nov 2008)
- Added .xml as one of the few common file extensions known by the multipart - Added .xml as one of the few common file extensions known by the multipart
form generator. form generator.
- Added some #ifdefs around header files and change the EAGAIN test to
fix compilation on Cell (reported by Jeff Curley).
Yang Tse (13 Nov 2008) Yang Tse (13 Nov 2008)
- Refactored configure script detection of functions used to set sockets into - Refactored configure script detection of functions used to set sockets into
non-blocking mode, and decouple function detection from function capability. non-blocking mode, and decouple function detection from function capability.

View File

@ -848,12 +848,14 @@ singleipconnect(struct connectdata *conn,
switch (error) { switch (error) {
case EINPROGRESS: case EINPROGRESS:
case EWOULDBLOCK: case EWOULDBLOCK:
#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK #if defined(EAGAIN)
#if (EAGAIN) != (EWOULDBLOCK)
/* On some platforms EAGAIN and EWOULDBLOCK are the /* On some platforms EAGAIN and EWOULDBLOCK are the
* same value, and on others they are different, hence * same value, and on others they are different, hence
* the odd #if * the odd #if
*/ */
case EAGAIN: case EAGAIN:
#endif
#endif #endif
rc = waitconnect(sockfd, timeout_ms); rc = waitconnect(sockfd, timeout_ms);
break; break;

View File

@ -53,7 +53,9 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>

View File

@ -57,7 +57,9 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>

View File

@ -52,7 +52,9 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>

View File

@ -52,7 +52,9 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>

View File

@ -63,7 +63,9 @@
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>