summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-16 17:31:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-16 17:31:55 +0200
commit5987107df46157eb847bc8271157ab8a7c73f6f4 (patch)
tree7ea7f89c54b2fe606282fb61975a02e76a46f0f3
parent538ec6d401f12a3de2e81ce054ef789fb47624ea (diff)
downloadrsyslog-5987107df46157eb847bc8271157ab8a7c73f6f4.tar.gz
rsyslog-5987107df46157eb847bc8271157ab8a7c73f6f4.tar.xz
rsyslog-5987107df46157eb847bc8271157ab8a7c73f6f4.zip
some cleanup after dual-merge
im3195 did not yet know about the new directory structure version bumped in support of new devel branch version
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--plugins/im3195/im3195.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ac35529..3e5a744d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-- implemented im3195, the RFC3195 input as a plugin
---------------------------------------------------------------------------
Version 3.19.0 (rgerhards), 2008-04-??
- begins new devel branch version
@@ -7,6 +6,7 @@ Version 3.19.0 (rgerhards), 2008-04-??
this shall enable other utilities but rsyslogd to use the same
runtime
- changed directory structure, files are now better organized
+- implemented im3195, the RFC3195 input as a plugin
---------------------------------------------------------------------------
Version 3.17.2 (rgerhards), 2008-04-??
- this version is the new beta
diff --git a/configure.ac b/configure.ac
index 88a92ebf..ddb91b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.17.2],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.19.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_HEADERS([config.h])
diff --git a/plugins/im3195/im3195.c b/plugins/im3195/im3195.c
index 51afd870..76d54e40 100644
--- a/plugins/im3195/im3195.c
+++ b/plugins/im3195/im3195.c
@@ -41,7 +41,7 @@
#include <sys/errno.h>
#include <assert.h>
#include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
#include "liblogging/liblogging.h"
#include "liblogging/srAPI.h"
#include "liblogging/syslogmessage.h"