summaryrefslogtreecommitdiff
path: root/src/fdevent.h
diff options
context:
space:
mode:
authorArno Töll <arno@debian.org>2011-07-03 23:55:35 +0000
committerArno Töll <arno@debian.org>2011-07-03 23:55:35 +0000
commit8199ae2d979736600ad452dfb722d503b14543e9 (patch)
treebef2945d3e3c22339f65068fe34e9a9eb31d01d5 /src/fdevent.h
parentfd61706305f6bece48a5839ac071cd73e749616e (diff)
downloadlighttpd-8199ae2d979736600ad452dfb722d503b14543e9.tar.gz
Import 1.4.29
Diffstat (limited to 'src/fdevent.h')
-rw-r--r--src/fdevent.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/fdevent.h b/src/fdevent.h
index 5f813d6..bdc82b5 100644
--- a/src/fdevent.h
+++ b/src/fdevent.h
@@ -49,16 +49,16 @@
# include <sys/devpoll.h>
#endif
+#if defined HAVE_PORT_H && defined HAVE_PORT_CREATE && defined(__sun)
+# define USE_SOLARIS_PORT
+# include <port.h>
+#endif
+
#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE
# define USE_FREEBSD_KQUEUE
# include <sys/event.h>
#endif
-#if defined HAVE_SYS_PORT_H && defined HAVE_PORT_CREATE
-# define USE_SOLARIS_PORT
-# include <sys/port.h>
-#endif
-
#if defined HAVE_LIBEV
# define USE_LIBEV
# include <ev.h>
@@ -90,6 +90,7 @@ typedef enum { FDEVENT_HANDLER_UNSET,
FDEVENT_HANDLER_POLL,
FDEVENT_HANDLER_LINUX_SYSEPOLL,
FDEVENT_HANDLER_SOLARIS_DEVPOLL,
+ FDEVENT_HANDLER_SOLARIS_PORT,
FDEVENT_HANDLER_FREEBSD_KQUEUE,
FDEVENT_HANDLER_LIBEV
} fdevent_handler_t;
@@ -153,6 +154,9 @@ typedef struct fdevents {
int devpoll_fd;
struct pollfd *devpollfds;
#endif
+#ifdef USE_SOLARIS_PORT
+ port_event_t *port_events;
+#endif
#ifdef USE_FREEBSD_KQUEUE
int kq_fd;
struct kevent *kq_results;
@@ -202,6 +206,7 @@ int fdevent_select_init(fdevents *ev);
int fdevent_poll_init(fdevents *ev);
int fdevent_linux_sysepoll_init(fdevents *ev);
int fdevent_solaris_devpoll_init(fdevents *ev);
+int fdevent_solaris_port_init(fdevents *ev);
int fdevent_freebsd_kqueue_init(fdevents *ev);
int fdevent_libev_init(fdevents *ev);