Fixed compilation with mariadb-10.2

[user/henk/code/exim.git] / src / src / ip.c

diff --git a/src/src/ip.c b/src/src/ip.c
index bf564662d057ac9c93419bfd939a6f4ba052f918..09b4c439e9b2b7f8880df0d3660f4b2f3e637f00 100644 (file)
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -457,7 +457,7 @@ ip_keepalive(int sock, const uschar *address, BOOL torf)
 {
 int fodder = 1;
 if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-    (uschar *)(&fodder), sizeof(fodder)) != 0)
+    US (&fodder), sizeof(fodder)) != 0)
   log_write(0, LOG_MAIN, "setsockopt(SO_KEEPALIVE) on connection %s %s "
     "failed: %s", torf? "to":"from", address, strerror(errno));
 }
@@ -492,7 +492,7 @@ if (time_left <= 0)
 
 do
   {
-  struct timeval tv = { time_left, 0 };
+  struct timeval tv = { .tv_sec = time_left, .tv_usec = 0 };
   FD_ZERO (&select_inset);
   FD_SET (fd, &select_inset);