diff options
| author | Glebs Ivanovskis <git-no-reply@zabbix.com> | 2016-04-12 09:41:45 +0300 |
|---|---|---|
| committer | Glebs Ivanovskis <git-no-reply@zabbix.com> | 2016-04-12 09:41:45 +0300 |
| commit | c08baf2dd03b59ad6e6372cc69d74c6104fd238f (patch) | |
| tree | 643e55934dae5c73b28abf630a4c120dc004c516 /include/proxy.h | |
| parent | 2156db123ce5807093473ef563ecabca4f385f73 (diff) | |
| parent | ce49cca4769ccf734c6ab7b76044947f2a39cb03 (diff) | |
.......... [ZBX-3823] updated to the latest trunk, resolved conflicts in proxypoller.c and trapper.c
Diffstat (limited to 'include/proxy.h')
| -rw-r--r-- | include/proxy.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/proxy.h b/include/proxy.h index b9e67b269d2..077d97c9964 100644 --- a/include/proxy.h +++ b/include/proxy.h @@ -68,7 +68,8 @@ void calc_timestamp(const char *line, int *timestamp, const char *format); void process_mass_data(zbx_socket_t *sock, zbx_uint64_t proxy_hostid, AGENT_VALUE *values, size_t value_num, int *processed); -int process_hist_data(zbx_socket_t *sock, struct zbx_json_parse *jp, const zbx_uint64_t proxy_hostid, char **info); +int process_hist_data(zbx_socket_t *sock, struct zbx_json_parse *jp, const zbx_uint64_t proxy_hostid, + zbx_timespec_t *ts, char **info); int process_dhis_data(struct zbx_json_parse *jp, char **error); int process_areg_data(struct zbx_json_parse *jp, zbx_uint64_t proxy_hostid, char **error); |