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 /runtime/msg.c | |
| 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
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |