diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2021-12-22 17:16:57 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-09-20 17:30:56 +0300 |
| commit | 6413c64a00065d69552bbcb20ba7cfd85f2445d9 (patch) | |
| tree | 82308db52905cdf120ba2c9db805ace7080ef24c /include/zbxserver.h | |
| parent | ab538970b650012ca20e593acf5aa6919830cac8 (diff) | |
.......... [ZBXNEXT-7122] resolved 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 a58b54d17da..df1451e55d5 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -22,6 +22,8 @@ #include "dbcache.h" #include "zbxvariant.h" +#include "zbxeval.h" +#include "zbxdb.h" #define MACRO_TYPE_MESSAGE_NORMAL 0x00000001 #define MACRO_TYPE_MESSAGE_RECOVERY 0x00000002 @@ -142,5 +144,4 @@ int xml_xpath_check(const char *xpath, char *error, size_t errlen); int zbx_substitute_expression_lld_macros(char **data, zbx_uint64_t rules, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, char **error); - #endif |