diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2008-11-14 23:17:32 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2008-11-14 23:17:32 +0000 |
| commit | ea8fbb5233b24745177871a7e1e9105a137f94f9 (patch) | |
| tree | a963f9776eec8eb2aa8f28638992bab9c05ad8c4 | |
| parent | 9b033e1b8a9eb81ff9468faa0e4839187ecdc568 (diff) | |
Added some #ifdefs around header files and change the EAGAIN test to
fix compilation on Cell (reported by Jeff Curley).
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | lib/connect.c | 4 | ||||
| -rw-r--r-- | lib/dict.c | 2 | ||||
| -rw-r--r-- | lib/file.c | 2 | ||||
| -rw-r--r-- | lib/telnet.c | 2 | ||||
| -rw-r--r-- | lib/tftp.c | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 2 |
7 files changed, 16 insertions, 1 deletions
@@ -10,6 +10,9 @@ Daniel Fandrich (14 Nov 2008) - Added .xml as one of the few common file extensions known by the multipart 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) - Refactored configure script detection of functions used to set sockets into non-blocking mode, and decouple function detection from function capability. diff --git a/lib/connect.c b/lib/connect.c index f2b15da82..30cd1535b 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -848,13 +848,15 @@ singleipconnect(struct connectdata *conn, switch (error) { case EINPROGRESS: case EWOULDBLOCK: -#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK +#if defined(EAGAIN) +#if (EAGAIN) != (EWOULDBLOCK) /* On some platforms EAGAIN and EWOULDBLOCK are the * same value, and on others they are different, hence * the odd #if */ case EAGAIN: #endif +#endif rc = waitconnect(sockfd, timeout_ms); break; default: diff --git a/lib/dict.c b/lib/dict.c index 6bd75f6dc..7fadfe892 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -53,7 +53,9 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/lib/file.c b/lib/file.c index b0af2fcd9..d1302ab81 100644 --- a/lib/file.c +++ b/lib/file.c @@ -57,7 +57,9 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/lib/telnet.c b/lib/telnet.c index 4d405b621..d9c5f07b7 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -52,7 +52,9 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/lib/tftp.c b/lib/tftp.c index e58365c10..15849c5e5 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -52,7 +52,9 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/lib/transfer.c b/lib/transfer.c index 35443bf2f..4313680ef 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -63,7 +63,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SIGNAL_H #include <signal.h> +#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> |