From: Roy Marples <roy@marples.name>
Date: Sun, 10 Feb 2008 23:30:08 +0000 (+0000)
Subject: Fix compile on NetBSD.
X-Git-Tag: v3.2.3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78d972e6f34625827ea48e1cd7c37e4304b1f8a;p=thirdparty%2Fdhcpcd.git

Fix compile on NetBSD.
---

diff --git a/client.c b/client.c
index 8630186d..a05d63cf 100644
--- a/client.c
+++ b/client.c
@@ -523,12 +523,14 @@ static int wait_for_packet (struct pollfd *fds, state_t *state,
 	while (state->timeout > 0 && retval == 0) {
 		if (iface->fd == -1)
 			timeout = INFTIM;
-		else
+		else {
 			timeout = TIMEOUT_MINI;
-		if (state->timeout < timeout)
-			timeout = (int) state->timeout;
+			if (state->timeout < timeout)
+				timeout = (int) state->timeout;
+			timeout *= 1000;
+		}
 		state->start = uptime ();
-		retval = poll (fds, iface->fd == -1 ? 1 : 2, timeout * 1000);
+		retval = poll (fds, iface->fd == -1 ? 1 : 2, timeout);
 		state->timeout -= uptime () - state->start;
 		if (retval == 0 && iface->fd != -1 && state->timeout > 0)
 			_send_message (state, state->last_type, options);
diff --git a/socket.c b/socket.c
index 8292705f..a3ceb8d0 100644
--- a/socket.c
+++ b/socket.c
@@ -39,6 +39,7 @@
 #include <netinet/udp.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -375,7 +376,7 @@ ssize_t get_packet (const interface_t *iface, unsigned char *data,
 		*buffer_len = read (iface->fd, bpf.buffer, iface->buffer_length);
 		*buffer_pos = 0;
 		if (*buffer_len < 1) {
-			struct timespec tv;
+			struct timespec ts;
 			logger (LOG_ERR, "read: %s", strerror (errno));
 			ts.tv_sec = 3;
 			ts.tv_nsec = 0;