This patch is for v7-stable but should also apply to master. Apply it with "git am"
Rely on the include paths set by json-c.pc instead of hardcoding the include to be <json/json.h> since this breaks with newer versions of json-c where the files are installed in /usr/include/json-c. While at it, remove a duplicate include. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From 659f534bef89948c9f62eac3ded939a977f3c3af Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Thu, 13 Feb 2014 23:01:47 +0100 Subject: [PATCH] Fix json includes Rely on the include paths set by json-c.pc instead of hardcoding the include to be <json/json.h> since this breaks with newer versions of json-c where the files are installed in /usr/include/json-c. While at it, remove a duplicate include. --- plugins/mmcount/mmcount.c | 2 +- plugins/mmsequence/mmsequence.c | 2 +- runtime/lookup.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/mmcount/mmcount.c b/plugins/mmcount/mmcount.c index 56a4de5..8a40e38 100644 --- a/plugins/mmcount/mmcount.c +++ b/plugins/mmcount/mmcount.c @@ -30,7 +30,7 @@ #include <errno.h> #include <unistd.h> #include <stdint.h> -#include <json/json.h> +#include <json.h> #include "conf.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/plugins/mmsequence/mmsequence.c b/plugins/mmsequence/mmsequence.c index 20a8537..47e9d5f 100644 --- a/plugins/mmsequence/mmsequence.c +++ b/plugins/mmsequence/mmsequence.c @@ -35,7 +35,7 @@ #include <stdint.h> #include <time.h> #include <limits.h> -#include <json/json.h> +#include <json.h> #include <pthread.h> #include "conf.h" #include "syslogd-types.h" diff --git a/runtime/lookup.c b/runtime/lookup.c index bc3b1a9..f2af17b 100644 --- a/runtime/lookup.c +++ b/runtime/lookup.c @@ -26,8 +26,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <json/json.h> -#include <json/json.h> +#include <json.h> #include <assert.h> #include "rsyslog.h" -- 1.9.0.rc3
_______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
