From 647d7877635e09e6170a4b670522a70050c2ec90 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jim@jimklimov.com>
Date: Fri, 6 May 2016 14:18:42 +0200
Subject: [PATCH 1/2] Fix missed inclusion of signal.h

---
 configure.ac      | 1 +
 services/comm.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index 264e3975a..bdd6d8cf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,7 @@ AC_CHECK_FUNCS([getrusage strsignal gettimeofday])
 AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa])
 AC_CHECK_FUNCS([strndup mmap strlcpy])
 AC_CHECK_FUNCS([getloadavg])
+AC_CHECK_FUNCS([signal])
 
 AC_CHECK_DECLS([snprintf, vsnprintf, vasprintf, asprintf, strndup])
 
diff --git a/services/comm.cpp b/services/comm.cpp
index d32b51f12..71a663b8d 100644
--- a/services/comm.cpp
+++ b/services/comm.cpp
@@ -24,6 +24,9 @@
 
 #include <config.h>
 
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>

From a71ca1cd0464d7c702f79c15d20c36138eccbb19 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jim@jimklimov.com>
Date: Tue, 10 May 2016 12:34:26 +0200
Subject: [PATCH 2/2] Reduce the signal.h fix to just adding the header in
 comm.cpp

---
 configure.ac      | 1 -
 services/comm.cpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index bdd6d8cf5..264e3975a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,6 @@ AC_CHECK_FUNCS([getrusage strsignal gettimeofday])
 AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa])
 AC_CHECK_FUNCS([strndup mmap strlcpy])
 AC_CHECK_FUNCS([getloadavg])
-AC_CHECK_FUNCS([signal])
 
 AC_CHECK_DECLS([snprintf, vsnprintf, vasprintf, asprintf, strndup])
 
diff --git a/services/comm.cpp b/services/comm.cpp
index 71a663b8d..795c6957f 100644
--- a/services/comm.cpp
+++ b/services/comm.cpp
@@ -24,9 +24,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>