diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
| commit | 2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch) | |
| tree | 8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /runtime/rule.h | |
| parent | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff) | |
| parent | 20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff) | |
| download | rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.bz2 rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip | |
Merge branch 'master-newconf'
Conflicts:
ChangeLog
tools/omfile.c
Diffstat (limited to 'runtime/rule.h')
| -rw-r--r-- | runtime/rule.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/rule.h b/runtime/rule.h index 3b34e11a..76ed5f0b 100644 --- a/runtime/rule.h +++ b/runtime/rule.h @@ -2,7 +2,7 @@ * * This implements rules within rsyslog. * - * Copyright 2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2009-2011 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -28,7 +28,7 @@ #include "libestr.h" #include "linkedlist.h" #include "regexp.h" -#include "expr.h" +#include "rainerscript.h" /* the rule object */ struct rule_s { @@ -52,7 +52,7 @@ struct rule_s { propid_t propID; /* ID of the requested property */ es_str_t *propName; /* name of property for CEE-based filters */ } prop; - expr_t *f_expr; /* expression object */ + struct cnfexpr *expr; /* expression object */ } f_filterData; ruleset_t *pRuleset; /* associated ruleset */ |