diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-05-12 11:11:54 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-05-12 11:41:02 +0300 |
| commit | 7179d22fecc24be41297695c3cb1e29d9a6eb37d (patch) | |
| tree | 7340c5a00298b5764e219218fb2959d6f91aaa4a /include/zbxserver.h | |
| parent | 77013e08b686205affb2faaca9f1ca82c75b5422 (diff) | |
........S. [ZBX-19307] cherry-picked from 5.2 and fixed conflicts
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 77e534feb41..f41f19121f5 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -78,7 +78,8 @@ int substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVE const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error, int maxerrlen); -void evaluate_expressions(zbx_vector_ptr_t *triggers); +void evaluate_expressions(zbx_vector_ptr_t *triggers, const zbx_vector_uint64_t *history_itemids, + const DC_ITEM *history_items, const int *history_errcodes); void prepare_triggers(DC_TRIGGER **triggers, int triggers_num); void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, |