From afe45bbbe250c2ba73858ca37e4a2a6cb18f6f8e Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 22 Apr 2010 15:09:40 +0200 Subject: fixed typo ... that caused compilation to fail on non-Solaris --- runtime/rsyslog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index b7117029..a6dfc9ed 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -106,7 +106,7 @@ typedef struct strmLstnPortList_s strmLstnPortList_t; // TODO: rename? typedef void nsd_t; typedef void nsdsel_t; #else - typedef obj_t obj_t_ptr; + typedef obj_t *obj_t_ptr; typedef obj_t nsd_t; typedef obj_t nsdsel_t; #endif -- cgit v1.2.3 From 9ba148cca62620d0bc9357b46393f9b5e2d6ede0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 22 Apr 2010 15:32:15 +0200 Subject: preparing for 4.7.1 release --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d279009e..7a1ad2ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 4.7.1 [v4-devel] (rgerhards), 2010-04-?? +Version 4.7.1 [v4-devel] (rgerhards), 2010-04-22 - Solaris support much improved -- was not truely usable in 4.7.0 Solaris is no longer supported in imklog, but rather there is a new plugin imsolaris, which is used to pull local log sources on a Solaris diff --git a/configure.ac b/configure.ac index 287534cd..6a4d2817 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],[4.7.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.7.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/manual.html b/doc/manual.html index 3d9a2f2d..a5f12a56 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 4.7.0 (v4-devel branch) of rsyslog. +

This documentation is for version 4.7.1 (v4-devel branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From 57eb123abe8aa4c169a5a155247f036b703cd8cf Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 23 Apr 2010 12:59:11 +0100 Subject: minor fix: invalid duplicated include of config.h --- runtime/atomic.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/runtime/atomic.h b/runtime/atomic.h index ea3be37a..271e825e 100644 --- a/runtime/atomic.h +++ b/runtime/atomic.h @@ -31,8 +31,6 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. */ -#include "config.h" /* autotools! */ - #ifndef INCLUDED_ATOMIC_H #define INCLUDED_ATOMIC_H -- cgit v1.2.3 From bbde403b46bd94cb8900562d8cfd3e0540913730 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 23 Apr 2010 13:00:21 +0100 Subject: cosmetic: prepared ChangeLog for next release --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7a1ad2ee..447f22fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ --------------------------------------------------------------------------- +Version 4.7.2 [v4-devel] (rgerhards), 2010-04-?? +--------------------------------------------------------------------------- Version 4.7.1 [v4-devel] (rgerhards), 2010-04-22 - Solaris support much improved -- was not truely usable in 4.7.0 Solaris is no longer supported in imklog, but rather there is a new -- cgit v1.2.3