diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-11-09 14:44:50 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-11-09 14:44:50 +0300 |
| commit | fb831f3178b898a0db64d2e7f017aae825d18533 (patch) | |
| tree | f8220825cfdf8456d1325f85c68b4c07066e4531 /include | |
| parent | 689a5591eb20a54bf5c1114a9147bc8e6451d43c (diff) | |
| parent | 1873100855685ae887206895a1e119b93d9905fe (diff) | |
........S. [ZBX-21616] fixed error due to non-existent macros in custom expressions
Merge in ZBX/zabbix from feature/ZBX-21616-6.3 to master
* commit '1873100855685ae887206895a1e119b93d9905fe':
........S. [ZBX-21616] renamed define
........S. [ZBX-21616] fixed function description comment
........S. [ZBX-21616] got rid of ZBX_FALLTROUGH
.......... [ZBX-21616] code style fix
........S. [ZBX-21616] fixed offseet calculation when replacing condition ids with values
........S. [ZBX-21616] added more optimizations to LLD filter processing
........S. [ZBX-21616] optimized
.......... [ZBX-21616] added changelog
.......... [ZBX-21616] added changelog
........S. [ZBX-21616] refactored and reimplemented parsing logics
........S. [ZBX-21616] fixed error due to non-existent macros in custom expressions
Diffstat (limited to 'include')
| -rw-r--r-- | include/zbxdbhigh.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/zbxdbhigh.h b/include/zbxdbhigh.h index 03067c163fd..f10862719ac 100644 --- a/include/zbxdbhigh.h +++ b/include/zbxdbhigh.h @@ -786,10 +786,10 @@ char *zbx_get_proxy_protocol_version_str(const struct zbx_json_parse *jp); int zbx_get_proxy_protocol_version_int(const char *version_str); /* condition evaluation types */ -#define ZBX_ACTION_CONDITION_EVAL_TYPE_AND_OR 0 -#define ZBX_ACTION_CONDITION_EVAL_TYPE_AND 1 -#define ZBX_ACTION_CONDITION_EVAL_TYPE_OR 2 -#define ZBX_ACTION_CONDITION_EVAL_TYPE_EXPRESSION 3 +#define ZBX_CONDITION_EVAL_TYPE_AND_OR 0 +#define ZBX_CONDITION_EVAL_TYPE_AND 1 +#define ZBX_CONDITION_EVAL_TYPE_OR 2 +#define ZBX_CONDITION_EVAL_TYPE_EXPRESSION 3 /* condition types */ #define ZBX_CONDITION_TYPE_HOST_GROUP 0 |