diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-05 12:06:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-05 12:06:09 +0200 |
| commit | c6a428e6935416c3c5d849df560b9492831e704c (patch) | |
| tree | 3ae55fb45404eab1b02097a48de9213b84fac599 | |
| parent | 920aa96c4a3fc8b06acbe6099bf8b83a9532f8e4 (diff) | |
| parent | dd9bdb5566c56a2bb67b09a67410b16e29004568 (diff) | |
| download | rsyslog-c6a428e6935416c3c5d849df560b9492831e704c.tar.gz rsyslog-c6a428e6935416c3c5d849df560b9492831e704c.tar.bz2 rsyslog-c6a428e6935416c3c5d849df560b9492831e704c.zip | |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/ommongodb/ommongodb.c | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -73,7 +73,11 @@ Version 7.5.0 [devel] 2013-06-11 connections Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- -Version 7.4.4 [v7.4-stable] 2013-0?-?? +Version 7.4.5 [v7.4-stable] 2013-09-?? +- bugfix: some more build problems with newer json-c versions + Thanks to Michael Biebl for mentioning the problem. +--------------------------------------------------------------------------- +Version 7.4.4 [v7.4-stable] 2013-09-03 - better error messages in GuardTime signature provider Thanks to Ahto Truu for providing the patch. - make rsyslog use the new json-c pkgconfig file if available diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c index 64d501d3..ecfd2518 100644 --- a/plugins/ommongodb/ommongodb.c +++ b/plugins/ommongodb/ommongodb.c @@ -35,7 +35,7 @@ #include <mongo.h> #include <json.h> /* For struct json_object_iter, should not be necessary in future versions */ -#include <json/json_object_private.h> +#include <json_object_private.h> #include "rsyslog.h" #include "conf.h" diff --git a/runtime/msg.c b/runtime/msg.c index 353f4e96..4221efe3 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -43,7 +43,7 @@ #include <libestr.h> #include <json.h> /* For struct json_object_iter, should not be necessary in future versions */ -#include <json/json_object_private.h> +#include <json_object_private.h> #if HAVE_MALLOC_H # include <malloc.h> #endif |