diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-10 06:45:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-10 06:45:13 +0200 |
| commit | 5b0595cc98c012dfa5ac0f214dbc543a11c982cb (patch) | |
| tree | 21d6b1b3cbad0c7609a3d3785332a5ffd2a8dee1 /runtime/objomsr.h | |
| parent | e1ab13c77be9fbe3e2e5dfe3357fcd9f991b71b5 (diff) | |
| download | rsyslog-5b0595cc98c012dfa5ac0f214dbc543a11c982cb.tar.gz | |
Imported Upstream version 7.1.9upstream/7.1.9
Diffstat (limited to 'runtime/objomsr.h')
| -rw-r--r-- | runtime/objomsr.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/objomsr.h b/runtime/objomsr.h index 643e02c..3baccaa 100644 --- a/runtime/objomsr.h +++ b/runtime/objomsr.h @@ -25,12 +25,13 @@ /* define flags for required template options */ #define OMSR_NO_RQD_TPL_OPTS 0 #define OMSR_RQD_TPL_OPT_SQL 1 -/* only one of OMSR_TPL_AS_ARRAY or _AS_MSG must be specified, if both are given - * results are unpredictable. +/* only one of OMSR_TPL_AS_ARRAY, _AS_MSG, or _AS_JSON must be specified, + * if all are given results are unpredictable. */ #define OMSR_TPL_AS_ARRAY 2 /* introduced in 4.1.6, 2009-04-03 */ #define OMSR_TPL_AS_MSG 4 /* introduced in 5.3.4, 2009-11-02 */ -/* next option is 8, 16, 32, ... */ +#define OMSR_TPL_AS_JSON 8 /* introduced in 6.5.1, 2012-09-02 */ +/* next option is 16, 32, 64, ... */ struct omodStringRequest_s { /* strings requested by output module for doAction() */ int iNumEntries; /* number of array entries for data elements below */ |