Merge branch 'v8-stable'

This commit is contained in:
Rainer Gerhards 2014-04-10 10:31:49 +02:00
commit e88ab44d95
2 changed files with 2 additions and 2 deletions

View File

@ -58,7 +58,6 @@ CLEANFILES = \
endif
EXTRA_DIST = \
rsyslog-doc.tar.gz \
platform/README \
platform/freebsd/rsyslogd \
platform/slackware/rc.rsyslogd \

View File

@ -18,7 +18,7 @@
*
* CDDL HEADER END
*/
/* Portions Copyright 2010 by Rainer Gerhards and Adiscon
/* Portions Copyright 2010-2014 by Rainer Gerhards and Adiscon
*/
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
@ -39,6 +39,7 @@
* software developed by the University of California, Berkeley, and its
* contributors.
*/
#include "config.h"
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>