diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 16:03:27 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 16:03:27 +0200 |
commit | dc4db17f51cc6d88af10a6155292ea53180a8e66 (patch) | |
tree | ae1a007713ed2bace76e4560bf20adbb84be4c73 /grammar/rainerscript.c | |
parent | efa8dfb47da3ea46f06ab561aeb82ef1d6c3ee93 (diff) | |
parent | 620d0448171378748495f495b6db7b67686cdf49 (diff) | |
download | rsyslog-dc4db17f51cc6d88af10a6155292ea53180a8e66.tar.gz rsyslog-dc4db17f51cc6d88af10a6155292ea53180a8e66.tar.bz2 rsyslog-dc4db17f51cc6d88af10a6155292ea53180a8e66.zip |
Merge branch 'master-var-refactor' into master-ruleeng
Diffstat (limited to 'grammar/rainerscript.c')
-rw-r--r-- | grammar/rainerscript.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index e41efa04..abf9dd34 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -1192,7 +1192,11 @@ var2Number(struct var *r, int *bSuccess) n = es_str2num(r->d.estr, bSuccess); } else { if(r->datatype == 'J') { +#ifdef HAVE_JSON_OBJECT_NEW_INT64 + n = (r->d.json == NULL) ? 0 : json_object_get_int64(r->d.json); +#else /* HAVE_JSON_OBJECT_NEW_INT64 */ n = (r->d.json == NULL) ? 0 : json_object_get_int(r->d.json); +#endif /* HAVE_JSON_OBJECT_NEW_INT64 */ } else { n = r->d.n; } |