some fixes from openbsd via brad

svn:r207

diff --git a/event.c b/event.c
index 4c8aeed3b82fb5c9e47206d471bd25e933cb40f5..82df1bedd89b320d6ed45961eaf2c2851cf8ba30 100644 (file)
--- a/event.c
+++ b/event.c
@@ -48,6 +48,7 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
+#include <signal.h>
 #include <string.h>
 #include <assert.h>
 
@@ -109,8 +110,8 @@ struct event_list signalqueue;
 struct event_base *current_base = NULL;
 
 /* Handle signals - This is a deprecated interface */
-int (*event_sigcb)(void);      /* Signal callback when gotsig is set */
-volatile int event_gotsig;     /* Set in signal handler */
+int (*event_sigcb)(void);              /* Signal callback when gotsig is set */
+volatile sig_atomic_t event_gotsig;    /* Set in signal handler */
 
 /* Prototypes */
 static void    event_queue_insert(struct event_base *, struct event *, int);

diff --git a/poll.c b/poll.c
index 437b94a29e3fe0e4a17dabf7756f6f560c05cf1b..698bbbf3a54e28689f7af93b436a3857e7d97d59 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -75,7 +75,7 @@ int poll_del          (void *, struct event *);
 int poll_recalc                (struct event_base *, void *, int);
 int poll_dispatch      (struct event_base *, void *, struct timeval *);
 
-struct eventop pollops = {
+const struct eventop pollops = {
        "poll",
        poll_init,
        poll_add,
@@ -89,7 +89,7 @@ poll_init(void)
 {
        struct pollop *pollop;
 
-       /* Disable kqueue when this environment variable is set */
+       /* Disable poll when this environment variable is set */
        if (getenv("EVENT_NOPOLL"))
                return (NULL);
 
@@ -182,7 +182,7 @@ poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
                return (0);
 
        for (i = 0; i < nfds; i++) {
-                int what = pop->event_set[i].revents;
+               int what = pop->event_set[i].revents;
                struct event *r_ev = NULL, *w_ev = NULL;
                if (!what)
                        continue;

diff --git a/select.c b/select.c
index 00909b79051e53bbdfb40de143ad4ace295a72cc..f4a3c3c3f1cc98e16fe22b31aa46b95e5235a56d 100644 (file)
--- a/select.c
+++ b/select.c
@@ -93,7 +93,7 @@ select_init(void)
 {
        struct selectop *sop;
 
-       /* Disable kqueue when this environment variable is set */
+       /* Disable select when this environment variable is set */
        if (getenv("EVENT_NOSELECT"))
                return (NULL);