From 48c5ce6cae7e303dfeee3a51091514ba4307bd3d Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Thu, 12 Jun 2014 15:27:08 +0000
Subject: update to 1.6.0 with official syslog support backported from the 1.7
 branch

tested by several, ok sthen@
---
 usr.sbin/nginx/src/os/unix/ngx_linux_config.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'usr.sbin/nginx/src/os/unix/ngx_linux_config.h')

diff --git a/usr.sbin/nginx/src/os/unix/ngx_linux_config.h b/usr.sbin/nginx/src/os/unix/ngx_linux_config.h
index 2834032dea0..72594bac0ea 100644
--- a/usr.sbin/nginx/src/os/unix/ngx_linux_config.h
+++ b/usr.sbin/nginx/src/os/unix/ngx_linux_config.h
@@ -22,6 +22,7 @@
 #include <stddef.h>             /* offsetof() */
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <errno.h>
 #include <string.h>
 #include <signal.h>
@@ -51,7 +52,6 @@
 #include <malloc.h>             /* memalign() */
 #include <limits.h>             /* IOV_MAX */
 #include <sys/ioctl.h>
-#include <sys/sysctl.h>
 #include <crypt.h>
 #include <sys/utsname.h>        /* uname() */
 
@@ -77,8 +77,14 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
 #endif
 
 
-#if (NGX_HAVE_POLL || NGX_HAVE_RTSIG)
+#if (NGX_HAVE_POLL)
+#include <poll.h>
+#endif
+
+
+#if (NGX_HAVE_RTSIG)
 #include <poll.h>
+#include <sys/sysctl.h>
 #endif
 
 
-- 
cgit v1.2.3-59-g8ed1b