Also removes all includes from syslogd.h which required including
sys/socket.h in two files.

 - todd

Index: usr.sbin/syslogd/evbuffer_tls.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/evbuffer_tls.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 evbuffer_tls.c
--- usr.sbin/syslogd/evbuffer_tls.c     20 Feb 2015 00:56:32 -0000      1.3
+++ usr.sbin/syslogd/evbuffer_tls.c     4 Jul 2015 02:15:14 -0000
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <tls.h>
 
 #include "evbuffer_tls.h"
Index: usr.sbin/syslogd/privsep.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/privsep.c,v
retrieving revision 1.52
diff -u -p -u -r1.52 privsep.c
--- usr.sbin/syslogd/privsep.c  30 Jun 2015 12:03:32 -0000      1.52
+++ usr.sbin/syslogd/privsep.c  4 Jul 2015 02:16:41 -0000
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 #include <sys/types.h>
@@ -30,14 +29,12 @@
 #include <limits.h>
 #include <netdb.h>
 #include <paths.h>
-#include <poll.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 #include <utmp.h>
 
 #include "syslogd.h"
Index: usr.sbin/syslogd/privsep_fdpass.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/privsep_fdpass.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 privsep_fdpass.c
--- usr.sbin/syslogd/privsep_fdpass.c   16 Jan 2015 06:40:21 -0000      1.9
+++ usr.sbin/syslogd/privsep_fdpass.c   4 Jul 2015 02:18:11 -0000
@@ -32,14 +32,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/uio.h>
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: usr.sbin/syslogd/ringbuf.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/ringbuf.c,v
retrieving revision 1.8
diff -u -p -u -r1.8 ringbuf.c
--- usr.sbin/syslogd/ringbuf.c  16 Jan 2015 06:40:21 -0000      1.8
+++ usr.sbin/syslogd/ringbuf.c  4 Jul 2015 02:14:18 -0000
@@ -21,6 +21,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: usr.sbin/syslogd/syslogd.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/syslogd.c,v
retrieving revision 1.168
diff -u -p -u -r1.168 syslogd.c
--- usr.sbin/syslogd/syslogd.c  2 Jul 2015 16:24:48 -0000       1.168
+++ usr.sbin/syslogd/syslogd.c  4 Jul 2015 02:19:30 -0000
@@ -66,9 +66,9 @@
 #define TTYMSGTIME     1               /* timeout passed to ttymsg */
 #define ERRBUFSIZE     256
 
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/msgbuf.h>
 #include <sys/queue.h>
@@ -89,7 +89,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
-#include <poll.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: usr.sbin/syslogd/syslogd.h
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/syslogd.h,v
retrieving revision 1.17
diff -u -p -u -r1.17 syslogd.h
--- usr.sbin/syslogd/syslogd.h  30 Jun 2015 12:03:32 -0000      1.17
+++ usr.sbin/syslogd/syslogd.h  4 Jul 2015 02:13:48 -0000
@@ -16,9 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
+struct iovec;
 
 /* Privilege separation */
 int   priv_init(char *, int, int, int, char **);
Index: usr.sbin/syslogd/ttymsg.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/ttymsg.c,v
retrieving revision 1.6
diff -u -p -u -r1.6 ttymsg.c
--- usr.sbin/syslogd/ttymsg.c   16 Jan 2015 06:40:21 -0000      1.6
+++ usr.sbin/syslogd/ttymsg.c   4 Jul 2015 02:14:04 -0000
@@ -32,6 +32,7 @@
 
 #include <sys/param.h> /* nitems */
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 

Reply via email to