From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 23 Apr 2009 00:21:23 +0000 (+0000)
Subject: Use signal.h, not sys/signal.h.
X-Git-Tag: release-2.0.3-alpha~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df0617f28978f809a93bbaf1efc24372a2d8d39f;p=libevent

Use signal.h, not sys/signal.h.

This is patch 2673214 from mmadia.  It is correct, since we unconditionally
include signal.h in many other places, and only sometimes include sys/signal.h.
It is necessary to compile on Haiku, I'm told.

svn:r1228
---

diff --git a/ChangeLog b/ChangeLog
index a8f77200..a22d9fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Changes in 2.0.2-alpha:
  o Add a flag to disable checking environment varibles when making an event_base
  o Disallow setting less than 1 priority.
  o Fix a bug when removing a timeout from the heap. [Patch from Marko Kreen]
+ o Use signal.h, not sys/signal.h. [Patch from mmadia]
 
 Changes in 2.0.1-alpha:
  o free minheap on event_base_free(); from Christopher Layne
diff --git a/configure.in b/configure.in
index c83cd0ae..3a040958 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AM_CONDITIONAL(ZLIB_REGRESS, [test "$have_zlib" != "no"])
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h stdarg.h inttypes.h stdint.h stddef.h poll.h signal.h unistd.h sys/epoll.h sys/time.h sys/queue.h sys/event.h sys/param.h sys/ioctl.h sys/select.h sys/devpoll.h port.h netinet/in.h netinet/in6.h sys/socket.h sys/uio.h arpa/inet.h sys/eventfd.h sys/mman.h sys/sendfile.h)
+AC_CHECK_HEADERS(fcntl.h stdarg.h inttypes.h stdint.h stddef.h poll.h unistd.h sys/epoll.h sys/time.h sys/queue.h sys/event.h sys/param.h sys/ioctl.h sys/select.h sys/devpoll.h port.h netinet/in.h netinet/in6.h sys/socket.h sys/uio.h arpa/inet.h sys/eventfd.h sys/mman.h sys/sendfile.h)
 if test "x$ac_cv_header_sys_queue_h" = "xyes"; then
 	AC_MSG_CHECKING(for TAILQ_FOREACH in sys/queue.h)
 	AC_EGREP_CPP(yes,
diff --git a/test/bench_cascade.c b/test/bench_cascade.c
index fe80b990..e9984ae5 100644
--- a/test/bench_cascade.c
+++ b/test/bench_cascade.c
@@ -36,9 +36,9 @@
 #include <windows.h>
 #else
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/resource.h>
 #endif
+#include <signal.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/test/bench_http.c b/test/bench_http.c
index 44c5716d..26088074 100644
--- a/test/bench_http.c
+++ b/test/bench_http.c
@@ -36,7 +36,6 @@
 #include <windows.h>
 #else
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/resource.h>
 #endif
 #include <fcntl.h>
diff --git a/test/regress_util.c b/test/regress_util.c
index 7e2bad71..f7059b3b 100644
--- a/test/regress_util.c
+++ b/test/regress_util.c
@@ -34,7 +34,6 @@
 #endif
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
@@ -42,6 +41,7 @@
 #ifdef _EVENT_HAVE_NETINET_IN6_H
 #include <netinet/in6.h>
 #endif
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/test/regress_zlib.c b/test/regress_zlib.c
index 6e6ce504..3f356fe1 100644
--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@@ -37,10 +37,10 @@
 #ifndef WIN32
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>