........S. [ZBXNEXT-6470,ZBXNEXT-6715] updated to the latest master

1 files changed, 11 insertions, 6 deletions

diff --git a/include/db.h b/include/db.h
index 147115df4c8..2ea42e8a189 100644
--- a/include/db.h
+++ b/include/db.h
@@ -614,12 +614,6 @@ void	DBdelete_triggers(zbx_vector_uint64_t *triggerids);
 void	DBdelete_hosts(zbx_vector_uint64_t *hostids);
 void	DBdelete_hosts_with_prototypes(zbx_vector_uint64_t *hostids);
 
-int	DBupdate_itservices(const zbx_vector_ptr_t *trigger_diff);
-int	DBremove_triggers_from_itservices(zbx_uint64_t *triggerids, int triggerids_num);
-
-int	zbx_create_itservices_lock(char **error);
-void	zbx_destroy_itservices_lock(void);
-
 void	DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
 		const zbx_uint64_t *values, const int num);
 void	DBadd_str_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
@@ -767,6 +761,17 @@ zbx_interface_availability_t;
 
 ZBX_PTR_VECTOR_DECL(availability_ptr, zbx_interface_availability_t *)
 
+typedef struct
+{
+	zbx_uint64_t		eventid;
+	int			clock;
+	int			value;
+	int			severity;
+
+	zbx_vector_ptr_t	tags;
+}
+zbx_event_t;
+
 void	zbx_db_update_interface_availabilities(const zbx_vector_availability_ptr_t *interface_availabilities);
 int	DBget_user_by_active_session(const char *sessionid, zbx_user_t *user);
 int	DBget_user_by_auth_token(const char *formatted_auth_token_hash, zbx_user_t *user);