Merge pull request #38 from bgernert/time.h-fix

Compilation fails under Alpine Linux
mariux64 · Jun 23, 2019 · 471f76a · 471f76a
2 parents 2dc57e0 + 8a9d099
commit 471f76a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/radsecproxy.c b/radsecproxy.c
@@ -1091,8 +1091,8 @@ struct clsrvconf *choosesrvconf(struct list *srvconfs) {
         server = (struct clsrvconf *)entry->data;
         if (!server->servers)
             return server;
-            if (server->servers->state == RSP_SERVER_STATE_FAILING)
-                continue;
+        if (server->servers->state == RSP_SERVER_STATE_FAILING)
+            continue;
         if (!first)
             first = server;
         if (server->servers->state == RSP_SERVER_STATE_STARTUP || server->servers->state == RSP_SERVER_STATE_RECONNECTING)

diff --git a/util.c b/util.c
@@ -15,7 +15,6 @@
 #include <poll.h>
 #include <stdarg.h>
 #include <assert.h>
-#include <sys/time.h>
 #include "debug.h"
 #include "util.h"
 

diff --git a/util.h b/util.h
@@ -3,6 +3,7 @@
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netdb.h>
 
 #define SOCKADDR_SIZE(addr) ((addr).ss_family == AF_INET ?	\