diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 11:49:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 11:49:32 +0100 |
| commit | c4f14fa28cc24cc56104b4b89ad380ee0f0470d3 (patch) | |
| tree | ae55c499426c23bf0a395e1f6dfe8b0a06822b90 /grammar/rainerscript.h | |
| parent | a734fe1378c727cb779a0e5e84599aaf6277bbf9 (diff) | |
| parent | 9052857047f0cb67ef7b2fe1519120bf37ba2648 (diff) | |
| download | rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.tar.gz rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.tar.bz2 rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Conflicts:
runtime/ruleset.c
required refactoring of (asnyc) call code
Diffstat (limited to 'grammar/rainerscript.h')
| -rw-r--r-- | grammar/rainerscript.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 001dff4e..377dde90 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -5,6 +5,7 @@ #include <typedefs.h> #include <sys/types.h> #include <regex.h> +#include "typedefs.h" #define LOG_NFACILITIES 24 /* current number of syslog facilities */ #define CNFFUNC_MAX_ARGS 32 @@ -170,6 +171,7 @@ struct cnfstmt { struct { es_str_t *name; struct cnfstmt *stmt; + ruleset_t *ruleset; /* non-NULL if the ruleset has a queue assigned */ } s_call; struct { uchar pmask[LOG_NFACILITIES+1]; /* priority mask */ |