diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2021-04-29 23:17:14 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2021-04-29 23:17:14 +0300 |
| commit | b0e412a0f3e098cf67b3b77edd78bdadcb17b14e (patch) | |
| tree | 2af0bf7dcd570cd8b38e775bb64b400a24b83001 /include | |
| parent | 143ec9cdb88dccd50d29effc93350e489f8e2d58 (diff) | |
| parent | 5359e133a4cd3620e75bb5f992db9d888a3b5ff7 (diff) | |
.......... [ZBXNEXT-6547] updated from the latest feature/ZBXNEXT-6452-5.3 (no conflicts)
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/zbxeval.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 477f7581a12..f02e79f3c1f 100644 --- a/include/common.h +++ b/include/common.h @@ -1689,6 +1689,5 @@ int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg); char *zbx_substr(const char *src, size_t left, size_t right); char *zbx_substr_unquote(const char *src, size_t left, size_t right); -char *zbx_substr(const char *src, size_t left, size_t right); #endif diff --git a/include/zbxeval.h b/include/zbxeval.h index e4aef0a7c6d..a4eb07ecd82 100644 --- a/include/zbxeval.h +++ b/include/zbxeval.h @@ -130,6 +130,7 @@ #define ZBX_EVAL_COMPOSE_LLD __UINT64_C(0x01000000) #define ZBX_EVAL_COMPOSE_FUNCTIONID __UINT64_C(0x02000000) #define ZBX_EVAL_COMPOSE_QUOTE __UINT64_C(0x04000000) +#define ZBX_EVAL_COMPOSE_MASK_ERROR __UINT64_C(0x08000000) /* expression evaluation rules */ |