diff options
Diffstat (limited to 'src/libs')
50 files changed, 109 insertions, 70 deletions
diff --git a/src/libs/zbxalgo/serialize.c b/src/libs/zbxalgo/serialize.c index 567b46229df..71ed45e374b 100644 --- a/src/libs/zbxalgo/serialize.c +++ b/src/libs/zbxalgo/serialize.c @@ -17,8 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -//#include "zbxserialize.h" +#include "string.h" +#include "zbxtypes.h" +/* #include "common.h" +#include "zbxserialize.h" */ /****************************************************************************** * * * Function: zbx_serialize_uint31_compact * diff --git a/src/libs/zbxaudit/audit_graph.c b/src/libs/zbxaudit/audit_graph.c index 71469032fc3..ad4ecc8fca2 100644 --- a/src/libs/zbxaudit/audit_graph.c +++ b/src/libs/zbxaudit/audit_graph.c @@ -21,6 +21,7 @@ #include "log.h" //#include "zbxalgo.h" +#include "db.h" #include "audit.h" #include "audit_graph.h" diff --git a/src/libs/zbxaudit/audit_graph.h b/src/libs/zbxaudit/audit_graph.h index 0a53785eab8..d4423b14ddf 100644 --- a/src/libs/zbxaudit/audit_graph.h +++ b/src/libs/zbxaudit/audit_graph.h @@ -23,7 +23,7 @@ #include "common.h" //#include "audit.h" -#include "../zbxdbhigh/template.h" +//#include "../zbxdbhigh/template.h" void zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const char *name, int flags); diff --git a/src/libs/zbxaudit/audit_host.h b/src/libs/zbxaudit/audit_host.h index c05dcb68f58..93bf4b928be 100644 --- a/src/libs/zbxaudit/audit_host.h +++ b/src/libs/zbxaudit/audit_host.h @@ -20,9 +20,11 @@ #ifndef ZABBIX_AUDIT_HOST_H #define ZABBIX_AUDIT_HOST_H -#include "common.h" +//#include "common.h" //#include "dbcache.h" //#include "audit.h" +#include "zbxtypes.h" +#include "zbxalgo.h" #define PREPARE_AUDIT_SNMP_INTERFACE_H(funcname) \ void zbx_audit_##funcname##_update_json_add_snmp_interface(zbx_uint64_t hostid, zbx_uint64_t version, \ diff --git a/src/libs/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c index d6c52dfbb75..ba88736dd53 100644 --- a/src/libs/zbxcompress/compress.c +++ b/src/libs/zbxcompress/compress.c @@ -17,8 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ + #include "common.h" #include "log.h" +//#include <errno.h> +//#include "log.h" //#include "zbxcompress.h" #ifdef HAVE_ZLIB diff --git a/src/libs/zbxcrypto/md5.c b/src/libs/zbxcrypto/md5.c index fb821090672..81db3c0c925 100644 --- a/src/libs/zbxcrypto/md5.c +++ b/src/libs/zbxcrypto/md5.c @@ -51,7 +51,8 @@ 1999-05-03 lpd Original version. */ -#include "common.h" +//#include "common.h" +#include "string.h" #include "md5.h" #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index c7f0804ef44..3218a5412ea 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -22,7 +22,7 @@ #include "common.h" #include "events.h" #include "threads.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "dbcache.h" #include "zbxalgo.h" #include "cfg.h" diff --git a/src/libs/zbxdbhigh/graph_linking.c b/src/libs/zbxdbhigh/graph_linking.c index 6807dfdbf5b..89174d508b0 100644 --- a/src/libs/zbxdbhigh/graph_linking.c +++ b/src/libs/zbxdbhigh/graph_linking.c @@ -20,6 +20,7 @@ #include "db.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_graph.h" +#include "../../libs/zbxalgo/vectorimpl.h" #include "graph_linking.h" typedef struct diff --git a/src/libs/zbxdbhigh/graph_linking.h b/src/libs/zbxdbhigh/graph_linking.h index 2696acac6bb..bf722ce6c10 100644 --- a/src/libs/zbxdbhigh/graph_linking.h +++ b/src/libs/zbxdbhigh/graph_linking.h @@ -20,10 +20,10 @@ #ifndef ZABBIX_GRAPH_LINKING_H #define ZABBIX_GRAPH_LINKING_H -#include "log.h" +//#include "log.h" #include "common.h" #include "zbxalgo.h" -#include "../../libs/zbxalgo/vectorimpl.h" +//#include "../../libs/zbxalgo/vectorimpl.h" int DBcopy_template_graphs(zbx_uint64_t hostid, const zbx_vector_uint64_t *templateids); diff --git a/src/libs/zbxdbhigh/lld_override.c b/src/libs/zbxdbhigh/lld_override.c index 52f07c519dc..0ec8f37bc5e 100644 --- a/src/libs/zbxdbhigh/lld_override.c +++ b/src/libs/zbxdbhigh/lld_override.c @@ -18,8 +18,10 @@ **/ #include "common.h" -#include "dbcache.h" +//#include "dbcache.h" #include "log.h" +#include "zbxalgo.h" +#include "zbxdb.h" #include "db.h" void zbx_lld_override_operation_free(zbx_lld_override_operation_t *override_operation) diff --git a/src/libs/zbxdbhigh/tag.c b/src/libs/zbxdbhigh/tag.c index 393a0aee395..d265bd85583 100644 --- a/src/libs/zbxdbhigh/tag.c +++ b/src/libs/zbxdbhigh/tag.c @@ -19,7 +19,7 @@ #include "common.h" #include "db.h" -#include "log.h" +//#include "log.h" #include "../zbxalgo/vectorimpl.h" zbx_db_tag_t *zbx_db_tag_create(const char *tag_tag, const char *tag_value) diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.c b/src/libs/zbxdbhigh/trigger_dep_linking.c index 17b9ef7847d..8d006418872 100644 --- a/src/libs/zbxdbhigh/trigger_dep_linking.c +++ b/src/libs/zbxdbhigh/trigger_dep_linking.c @@ -20,6 +20,8 @@ #include "db.h" #include "log.h" #include "../../libs/zbxaudit/audit_trigger.h" +#include "../../libs/zbxalgo/vectorimpl.h" + #include "trigger_dep_linking.h" typedef struct diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.h b/src/libs/zbxdbhigh/trigger_dep_linking.h index e0a4619d5f5..df58c48cd14 100644 --- a/src/libs/zbxdbhigh/trigger_dep_linking.h +++ b/src/libs/zbxdbhigh/trigger_dep_linking.h @@ -23,7 +23,7 @@ //#include "log.h" #include "common.h" #include "zbxalgo.h" -#include "../../libs/zbxalgo/vectorimpl.h" +//#include "../../libs/zbxalgo/vectorimpl.h" #define TRIGGER_DEP_SYNC_INSERT_OP 0 #define TRIGGER_DEP_SYNC_UPDATE_OP 1 diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c index 713143b3b9d..db5ec0a339a 100644 --- a/src/libs/zbxdbhigh/trigger_linking.c +++ b/src/libs/zbxdbhigh/trigger_linking.c @@ -22,6 +22,7 @@ #include "log.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_trigger.h" +#include "../../libs/zbxalgo/vectorimpl.h" #include "trigger_dep_linking.h" #include "trigger_linking.h" diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c index faee357fe28..1d348c4cc00 100644 --- a/src/libs/zbxeval/calc.c +++ b/src/libs/zbxeval/calc.c @@ -19,8 +19,8 @@ #include "common.h" #include "zbxalgo.h" -#include "zbxeval.h" -#include "log.h" +//#include "zbxeval.h" +//#include "log.h" #include "../../libs/zbxalgo/vectorimpl.h" typedef struct diff --git a/src/libs/zbxeval/misc.c b/src/libs/zbxeval/misc.c index a49c2b1a764..4010371269e 100644 --- a/src/libs/zbxeval/misc.c +++ b/src/libs/zbxeval/misc.c @@ -21,10 +21,10 @@ #include "log.h" #include "zbxalgo.h" -#include "../zbxalgo/vectorimpl.h" +//#include "../zbxalgo/vectorimpl.h" #include "zbxvariant.h" #include "zbxserialize.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "eval.h" #define ZBX_EVAL_STATIC_BUFFER_SIZE 4096 diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c index 5a2b2edf7f7..4da9969ce0a 100644 --- a/src/libs/zbxeval/parse.c +++ b/src/libs/zbxeval/parse.c @@ -25,7 +25,8 @@ #include "zbxvariant.h" //#include "zbxserialize.h" //#include "zbxserver.h" -#include "eval.h" +//#include "eval.h" +#include "zbxeval.h" ZBX_VECTOR_IMPL(eval_token, zbx_eval_token_t) diff --git a/src/libs/zbxeval/query.c b/src/libs/zbxeval/query.c index 928f7b05de8..e21f0210dbd 100644 --- a/src/libs/zbxeval/query.c +++ b/src/libs/zbxeval/query.c @@ -17,11 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbxeval.h" #include "common.h" -#include "log.h" +//#include "log.h" #include "zbxalgo.h" #include "zbxserver.h" -#include "zbxeval.h" +//#include "zbxeval.h" #include "eval.h" /* The tag expression token is virtual token used during item query filter processing. */ diff --git a/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c index 1e96fb5bec0..286bd8b9a60 100644 --- a/src/libs/zbxhistory/history_elastic.c +++ b/src/libs/zbxhistory/history_elastic.c @@ -22,7 +22,7 @@ #include "zbxalgo.h" #include "dbcache.h" #include "zbxhistory.h" -#include "zbxself.h" +//#include "zbxself.h" #include "history.h" /* curl_multi_wait() is supported starting with version 7.28.0 (0x071c00) */ diff --git a/src/libs/zbxhistory/history_sql.c b/src/libs/zbxhistory/history_sql.c index 8713b7fa748..31de3ab86ab 100644 --- a/src/libs/zbxhistory/history_sql.c +++ b/src/libs/zbxhistory/history_sql.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "log.h" +//#include "log.h" #include "zbxalgo.h" #include "db.h" #include "dbcache.h" diff --git a/src/libs/zbxmedia/sms.c b/src/libs/zbxmedia/sms.c index dff1335216e..aa5da2db1d3 100644 --- a/src/libs/zbxmedia/sms.c +++ b/src/libs/zbxmedia/sms.c @@ -20,7 +20,7 @@ #include "common.h" #include "log.h" -#include "zbxmedia.h" +//#include "zbxmedia.h" #include <termios.h> diff --git a/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c index 81981d4f31a..2f13ed8bccd 100644 --- a/src/libs/zbxnix/control.c +++ b/src/libs/zbxnix/control.c @@ -17,7 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +//#include <string.h> #include "control.h" +#include "common.h" //#include "zbxdiag.h" static int parse_log_level_options(const char *opt, size_t len, unsigned int *scope, unsigned int *data) diff --git a/src/libs/zbxnix/control.h b/src/libs/zbxnix/control.h index 8e851c9de3c..1ef16f046ff 100644 --- a/src/libs/zbxnix/control.h +++ b/src/libs/zbxnix/control.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_CONTROL_H #define ZABBIX_CONTROL_H -#include "common.h" +//#include "common.h" #define ZBX_RTC_LOG_SCOPE_FLAG 0x80 #define ZBX_RTC_LOG_SCOPE_PROC 0 diff --git a/src/libs/zbxrtc/rtc.c b/src/libs/zbxrtc/rtc.c index f333fd8d192..3037213d275 100644 --- a/src/libs/zbxrtc/rtc.c +++ b/src/libs/zbxrtc/rtc.c @@ -17,13 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "zbxjson.h" -#include "daemon.h" -#include "zbxrtc.h" +//#include "zbxipcservice.h" +//#include "zbxjson.h" +//#include "daemon.h" +//#include "zbxrtc.h" #include "rtc.h" -#include "log.h" -#include "zbxdiag.h" +//#include "log.h" +//#include "zbxdiag.h" +#include "common.h" /****************************************************************************** * * diff --git a/src/libs/zbxrtc/rtc.h b/src/libs/zbxrtc/rtc.h index 57d67b55e4e..e7d9ebf79cf 100644 --- a/src/libs/zbxrtc/rtc.h +++ b/src/libs/zbxrtc/rtc.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_RTC_H #define ZABBIX_RTC_H +#include "zbxtypes.h" + #define ZBX_IPC_SERVICE_RTC "rtc" int zbx_rtc_parse_loglevel_option(const char *opt, size_t len, pid_t *pid, int *proc_type, int *proc_num, diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c index f5c6a698539..3eab0fd7d4a 100644 --- a/src/libs/zbxrtc/rtc_client.c +++ b/src/libs/zbxrtc/rtc_client.c @@ -19,7 +19,7 @@ #include "zbxipcservice.h" #include "zbxjson.h" -#include "zbxrtc.h" +//#include "zbxrtc.h" #include "rtc.h" extern int CONFIG_TIMEOUT; diff --git a/src/libs/zbxrtc/rtc_proxy.c b/src/libs/zbxrtc/rtc_proxy.c index 6a9b3096476..28df99e6f31 100644 --- a/src/libs/zbxrtc/rtc_proxy.c +++ b/src/libs/zbxrtc/rtc_proxy.c @@ -17,9 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "zbxrtc.h" -#include "rtc.h" +//#include "zbxipcservice.h" +//#include "zbxrtc.h" +//#include "rtc.h" +#include "zbxtypes.h" #include "proxy.h" extern int CONFIG_PROXYMODE; diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c index 76a638b4901..7a556ed6575 100644 --- a/src/libs/zbxrtc/rtc_server.c +++ b/src/libs/zbxrtc/rtc_server.c @@ -17,14 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "daemon.h" +//#include "zbxipcservice.h" #include "log.h" #include "zbxdiag.h" #include "zbxjson.h" #include "zbxha.h" -#include "zbxrtc.h" -#include "rtc.h" +//#include "zbxrtc.h" +//#include "rtc.h" +#include "zbxtypes.h" +#include "common.h" +#include "daemon.h" int rtc_parse_options_ex(const char *opt, zbx_uint32_t *code, char **data, char **error) { diff --git a/src/libs/zbxserver/anomalystl.c b/src/libs/zbxserver/anomalystl.c index 5528880f490..02aa50baec5 100644 --- a/src/libs/zbxserver/anomalystl.c +++ b/src/libs/zbxserver/anomalystl.c @@ -18,12 +18,13 @@ **/ #include "common.h" -#include "db.h" +//#include "db.h" #include "log.h" -#include "zbxserver.h" -#include "zbxregexp.h" -#include "valuecache.h" -#include "zbxtrends.h" +//#include "zbxserver.h" +//#include "zbxregexp.h" +//#include "valuecache.h" +//#include "zbxtrends.h" +#include "zbxeval.h" #include "../zbxalgo/vectorimpl.h" #include "anomalystl.h" diff --git a/src/libs/zbxserver/anomalystl.h b/src/libs/zbxserver/anomalystl.h index 527d6f8ef10..aa584fcbf2b 100644 --- a/src/libs/zbxserver/anomalystl.h +++ b/src/libs/zbxserver/anomalystl.h @@ -20,9 +20,12 @@ #ifndef ZABBIX_ANOMALYSTL_H #define ZABBIX_ANOMALYSTL_H -#include "common.h" +//#include "common.h" -#include "evalfunc_common.h" +//#include "evalfunc_common.h" + +#include "zbxalgo.h" +#include "zbxhistory.h" /* default values which can be used in zbx_STL() arguments */ #define STL_DEF_DEVIATIONS 3 diff --git a/src/libs/zbxserver/evalfunc_common.h b/src/libs/zbxserver/evalfunc_common.h index bec0de4b7af..5dfdf91b7fb 100644 --- a/src/libs/zbxserver/evalfunc_common.h +++ b/src/libs/zbxserver/evalfunc_common.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_EVALFUNC_COMMON_H #define ZABBIX_EVALFUNC_COMMON_H -#include "common.h" +//#include "common.h" +#include "zbxtypes.h" typedef enum { diff --git a/src/libs/zbxserver/zabbix_stats.c b/src/libs/zbxserver/zabbix_stats.c index 56183420cda..e1a3a9ca3e6 100644 --- a/src/libs/zbxserver/zabbix_stats.c +++ b/src/libs/zbxserver/zabbix_stats.c @@ -21,10 +21,10 @@ #include "zbxjson.h" #include "dbcache.h" #include "zbxself.h" -#include "valuecache.h" +//#include "valuecache.h" #include "../../zabbix_server/vmware/vmware.h" #include "preproc.h" -#include "zbxtrends.h" +//#include "zbxtrends.h" #include "zabbix_stats.h" diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c index 8422af873d1..d0910f69a2a 100644 --- a/src/libs/zbxserver/zabbix_stats_proxy.c +++ b/src/libs/zbxserver/zabbix_stats_proxy.c @@ -19,7 +19,7 @@ #include "common.h" #include "zbxjson.h" -#include "zabbix_stats.h" +//#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c index f79b35f5e91..90d617c362b 100644 --- a/src/libs/zbxserver/zabbix_stats_server.c +++ b/src/libs/zbxserver/zabbix_stats_server.c @@ -21,13 +21,13 @@ #include "zbxjson.h" #include "dbcache.h" #include "valuecache.h" -#include "preproc.h" +//#include "preproc.h" #include "zbxlld.h" #include "log.h" #include "zbxtrends.h" #include "zbxha.h" -#include "zabbix_stats.h" +//#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxsysinfo/common/Makefile.am b/src/libs/zbxsysinfo/common/Makefile.am index d6326a28ab2..92116fcee2a 100644 --- a/src/libs/zbxsysinfo/common/Makefile.am +++ b/src/libs/zbxsysinfo/common/Makefile.am @@ -5,8 +5,8 @@ noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_h libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ libcommonsysinfo_a_SOURCES = \ - common.c \ - common.h \ + zbxsysinfo_common.c \ + zbxsysinfo_common.h \ cpu.c \ cpu.h \ dir.c \ diff --git a/src/libs/zbxsysinfo/common/dir.h b/src/libs/zbxsysinfo/common/dir.h index d38a45c0ac2..8a800a91988 100644 --- a/src/libs/zbxsysinfo/common/dir.h +++ b/src/libs/zbxsysinfo/common/dir.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_DIR_H #define ZABBIX_SYSINFO_COMMON_DIR_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" #include "zbxjson.h" #define DISK_BLOCK_SIZE 512 /* 512-byte blocks */ diff --git a/src/libs/zbxsysinfo/common/dns.c b/src/libs/zbxsysinfo/common/dns.c index 7e566cfb179..086b1f82e81 100644 --- a/src/libs/zbxsysinfo/common/dns.c +++ b/src/libs/zbxsysinfo/common/dns.c @@ -22,7 +22,7 @@ #include "comms.h" #include "log.h" -#include "cfg.h" +//#include "cfg.h" #include "dns.h" #include "zbxalgo.h" diff --git a/src/libs/zbxsysinfo/common/dns.h b/src/libs/zbxsysinfo/common/dns.h index dd7adfea092..71a8b61c3cf 100644 --- a/src/libs/zbxsysinfo/common/dns.h +++ b/src/libs/zbxsysinfo/common/dns.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_DNS_H #define ZABBIX_SYSINFO_COMMON_DNS_H -#include "sysinfo.h" +#include "config.h" +//#include "sysinfo.h" #if defined(HAVE_RES_QUERY) || defined(_WINDOWS) || defined(__MINGW32__) diff --git a/src/libs/zbxsysinfo/common/file.h b/src/libs/zbxsysinfo/common/file.h index 05e4f8332d1..c602ed746e9 100644 --- a/src/libs/zbxsysinfo/common/file.h +++ b/src/libs/zbxsysinfo/common/file.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_FILE_H #define ZABBIX_SYSINFO_COMMON_FILE_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" #define MAX_FILE_LEN (1024 * 1024) diff --git a/src/libs/zbxsysinfo/common/http.c b/src/libs/zbxsysinfo/common/http.c index 310bbdcc1e0..951a45341a5 100644 --- a/src/libs/zbxsysinfo/common/http.c +++ b/src/libs/zbxsysinfo/common/http.c @@ -18,12 +18,13 @@ **/ #include "common.h" -#include "sysinfo.h" +//#include "sysinfo.h" #include "zbxregexp.h" #include "zbxhttp.h" #include "comms.h" -#include "cfg.h" +//#include "cfg.h" +extern int CONFIG_TIMEOUT; #include "http.h" diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c index 27c4d836066..bf35aad982c 100644 --- a/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c @@ -18,14 +18,15 @@ **/ #include "common.h" -#include "sysinfo.h" +//#include "sysinfo.h" +#include "module.h" #include "comms.h" #include "log.h" #include "cfg.h" #include "net.h" -#include "zbxalgo.h" +//#include "zbxalgo.h" int tcp_expect(const char *host, unsigned short port, int timeout, const char *request, int (*validate_func)(const char *), const char *sendtoclose, int *value_int) diff --git a/src/libs/zbxsysinfo/common/net.h b/src/libs/zbxsysinfo/common/net.h index cd36736e555..ad0b1b9b608 100644 --- a/src/libs/zbxsysinfo/common/net.h +++ b/src/libs/zbxsysinfo/common/net.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_NET_H #define ZABBIX_SYSINFO_COMMON_NET_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" extern char *CONFIG_SOURCE_IP; diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c index c8a9c7561ea..e978133e542 100644 --- a/src/libs/zbxsysinfo/common/system.c +++ b/src/libs/zbxsysinfo/common/system.c @@ -17,8 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "../../../../include/common.h" #include "system.h" +#include "common.h" +#include "zbxsysinfo_common.h" #if defined(_WINDOWS) || defined(__MINGW32__) # include "perfmon.h" diff --git a/src/libs/zbxsysinfo/common/system.h b/src/libs/zbxsysinfo/common/system.h index 1c4f1bfa14f..1a3be5a4a8e 100644 --- a/src/libs/zbxsysinfo/common/system.h +++ b/src/libs/zbxsysinfo/common/system.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_SYSTEM_H #define ZABBIX_SYSINFO_COMMON_SYSTEM_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" int SYSTEM_LOCALTIME(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_USERS_NUM(AGENT_REQUEST *request, AGENT_RESULT *result); diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/zbxsysinfo_common.c index 4a3200d1c22..19af9aa2410 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/zbxsysinfo_common.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "zbxsysinfo_common.h" #include "sysinfo.h" #include "log.h" diff --git a/src/libs/zbxsysinfo/common/common.h b/src/libs/zbxsysinfo/common/zbxsysinfo_common.h index c40b2cdd823..c40b2cdd823 100644 --- a/src/libs/zbxsysinfo/common/common.h +++ b/src/libs/zbxsysinfo/common/zbxsysinfo_common.h diff --git a/src/libs/zbxsysinfo/linux/hardware.c b/src/libs/zbxsysinfo/linux/hardware.c index 4f1102fb316..931eb1c422b 100644 --- a/src/libs/zbxsysinfo/linux/hardware.c +++ b/src/libs/zbxsysinfo/linux/hardware.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" #include "sysinfo.h" #include <sys/mman.h> #include <setjmp.h> diff --git a/src/libs/zbxsysinfo/simple/ntp.c b/src/libs/zbxsysinfo/simple/ntp.c index da855d0636d..5320ec46183 100644 --- a/src/libs/zbxsysinfo/simple/ntp.c +++ b/src/libs/zbxsysinfo/simple/ntp.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "sysinfo.h" +//#include "sysinfo.h" #include "comms.h" #include "log.h" diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c index 298e4fc4586..f8ed0587bc8 100644 --- a/src/libs/zbxsysinfo/sysinfo.c +++ b/src/libs/zbxsysinfo/sysinfo.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "common/zbxsysinfo_common.h" #include "module.h" #include "sysinfo.h" #include "log.h" @@ -36,9 +36,9 @@ extern int CONFIG_TIMEOUT; # include "agent/agent.h" #endif -#ifdef WITH_COMMON_METRICS -# include "common/common.h" -#endif +/* #ifdef WITH_COMMON_METRICS */ +/* # include "common/common.h" */ +/* #endif */ #ifdef WITH_HTTP_METRICS # include "common/http_metrics.h" diff --git a/src/libs/zbxtasks/task.c b/src/libs/zbxtasks/task.c index c96f4492da7..807215f1985 100644 --- a/src/libs/zbxtasks/task.c +++ b/src/libs/zbxtasks/task.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include <assert.h> +//#include <assert.h> #include "common.h" #include "log.h" |