diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 15:46:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 15:46:18 +0200 |
| commit | 0088c275da85e49005a2294335fb3365583d2bb9 (patch) | |
| tree | 1e7b9eedf571651ad27c2337b64eb8f5e6b51c3f /grammar | |
| parent | 8b50bdbee90d9bd00a78e776d5ade60d085c0823 (diff) | |
| parent | 4acf8e361aa68b3e753611c7c7e607c04dfd8d1a (diff) | |
| download | rsyslog-0088c275da85e49005a2294335fb3365583d2bb9.tar.gz rsyslog-0088c275da85e49005a2294335fb3365583d2bb9.tar.bz2 rsyslog-0088c275da85e49005a2294335fb3365583d2bb9.zip | |
Merge branch 'master' into master-var-refactor
Diffstat (limited to 'grammar')
| -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; } |