aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/connect.c4
-rw-r--r--lib/dict.c2
-rw-r--r--lib/file.c2
-rw-r--r--lib/telnet.c2
-rw-r--r--lib/tftp.c2
-rw-r--r--lib/transfer.c2
6 files changed, 13 insertions, 1 deletions
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>