diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-27 13:12:02 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-27 13:12:02 +0300 |
| commit | 98dc192442c67820b1f6660c2495230ec06295ba (patch) | |
| tree | 1872c6530f57b1e0318c259fc5e405f463ddf15a /include/zbxhistory.h | |
| parent | d51507d2f1982b0db901b8bac28710487ad031fc (diff) | |
| parent | 07266a2eb54eeb012cfecea7d25371b42ffcd32d (diff) | |
........S. [ZBXNEXT-702] merge with master, do not resolve conflicts
Diffstat (limited to 'include/zbxhistory.h')
| -rw-r--r-- | include/zbxhistory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/zbxhistory.h b/include/zbxhistory.h index 67c88ca1aca..286f93144ca 100644 --- a/include/zbxhistory.h +++ b/include/zbxhistory.h @@ -38,7 +38,11 @@ int zbx_history_record_compare_asc_func(const zbx_history_record_t *d1, const zb int zbx_history_record_compare_desc_func(const zbx_history_record_t *d1, const zbx_history_record_t *d2); void zbx_history_value2str(char *buffer, size_t size, const history_value_t *value, int value_type); +<<<<<<< HEAD char *zbx_history_value2str_dyn(const history_value_t *value, int value_type); +======= +void zbx_history_value_print(char *buffer, size_t size, const history_value_t *value, int value_type); +>>>>>>> 07266a2eb54eeb012cfecea7d25371b42ffcd32d /* In most cases zbx_history_record_vector_destroy() function should be used to free the */ /* value vector filled by zbx_vc_get_value* functions. This define simply better */ |