Skip to content

Commit

Permalink
Fix json includes
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mbiebl committed Feb 15, 2014
1 parent 2988df6 commit 9962081
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion plugins/mmcount/mmcount.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/mmsequence/mmsequence.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions runtime/lookup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9962081

Please sign in to comment.