Merge branch 'mingw-signal' of https://github.com/nmaier/aria2 into nmaier-mingw-signal

configure.ac

@@ -365,6 +365,7 @@ AC_CHECK_HEADERS([argz.h \
                   netinet/tcp.h \
 		  poll.h \
 		  port.h \
+                  signal.h \
                   stddef.h \
                   stdint.h \
                   stdio_ext.h \
@@ -373,6 +374,7 @@ AC_CHECK_HEADERS([argz.h \
                   strings.h \
                   sys/ioctl.h \
                   sys/param.h \
+                  sys/signal.h \
                   sys/socket.h \
                   sys/time.h \
                   sys/types.h \

src/util.cc

@@ -34,7 +34,14 @@
 /* copyright --> */
 #include "util.h"
 
-#include <sys/signal.h>
+#ifdef HAVE_SYS_SIGNAL_H
+#  include <sys/signal.h>
+#else // HAVE_SYS_SIGNAL_H
+#  ifdef HAVE_SIGNAL_H
+#    include <signal.h>
+#  endif // HAVE_SIGNAL_H
+#endif // HAVE_SYS_SIGNAL_H
+
 #include <sys/types.h>
 #ifdef HAVE_PWD_H
 #  include <pwd.h>