diff options
| author | Andrejs Verza <andrejs.verza@zabbix.com> | 2021-05-06 13:52:14 +0300 |
|---|---|---|
| committer | Andrejs Verza <andrejs.verza@zabbix.com> | 2021-05-06 13:52:39 +0300 |
| commit | f82bd3b48129b7760e0bfc9e6f92637d9d8cc8d0 (patch) | |
| tree | a5b04355520fb4b065f10138621dbd312acd54c4 /include | |
| parent | 8413ea57f74b0e66c2abe79f762f74bfb0a45be1 (diff) | |
| parent | 761774601a6a56de0736e92a18e0dc6f8e3b92be (diff) | |
.......... [ZBXNEXT-6451,ZBXNEXT-6455] updated to the latest master branch (no conflicts)
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/zbxalert.h | 2 | ||||
| -rw-r--r-- | include/zbxreport.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index baa24561c93..e4a604db362 100644 --- a/include/common.h +++ b/include/common.h @@ -1696,7 +1696,7 @@ int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg); #define ZBX_REPORT_CYCLE_YEARLY 3 int zbx_get_report_nextcheck(int now, unsigned char cycle, unsigned char weekdays, int start_time, - const char *timezone); + const char *tz); /* */ char *zbx_substr(const char *src, size_t left, size_t right); diff --git a/include/zbxalert.h b/include/zbxalert.h index f168ada34d0..3209b5e7316 100644 --- a/include/zbxalert.h +++ b/include/zbxalert.h @@ -56,7 +56,7 @@ int zbx_alerter_get_top_sources(int limit, zbx_vector_ptr_t *sources, char **err int zbx_alerter_begin_dispatch(zbx_alerter_dispatch_t *dispatch, const char *subject, const char *message, const char *content_name, const char *content_type, const char *content, zbx_uint32_t content_size, char **error); -int zbx_alerter_send_dispatch(zbx_alerter_dispatch_t *dispatch, const DB_MEDIATYPE *mt, +int zbx_alerter_send_dispatch(zbx_alerter_dispatch_t *dispatch, const DB_MEDIATYPE *mediatype, const zbx_vector_str_t *recipients, char **error); int zbx_alerter_end_dispatch(zbx_alerter_dispatch_t *dispatch, char **error); void zbx_alerter_dispatch_result_free(zbx_alerter_dispatch_result_t *result); diff --git a/include/zbxreport.h b/include/zbxreport.h index 3ea82f720ab..8631e3d5083 100644 --- a/include/zbxreport.h +++ b/include/zbxreport.h @@ -29,6 +29,6 @@ #define ZBX_REPORT_PERIOD_MONTH 0 #define ZBX_REPORT_PERIOD_YEAR 0 -void zbx_report_test(const struct zbx_json_parse *jp, zbx_uint64_t tester_userid, struct zbx_json *j); +void zbx_report_test(const struct zbx_json_parse *jp, zbx_uint64_t userid, struct zbx_json *j); #endif |