diff options
| author | Andrejs Tumilovics <andrejs.tumilovics@zabbix.com> | 2019-12-11 11:58:27 +0300 |
|---|---|---|
| committer | Andrejs Tumilovics <andrejs.tumilovics@zabbix.com> | 2019-12-11 11:58:27 +0300 |
| commit | b2489e1ecae5260f34ff5025c6e25438ab8d1a82 (patch) | |
| tree | 32bff7f20ac617a79275e05ef5a0c6769c159523 /include/sysinfo.h | |
| parent | 22ce36a46da278cc87052c3e28f03962fe6e1f45 (diff) | |
| parent | 72a569f0928fb8676bebc4c99c9acc2c0cb96a46 (diff) | |
.......... [ZBXNEXT-1085] merge from source branch (fixed .gitignore conflicts)
Diffstat (limited to 'include/sysinfo.h')
| -rw-r--r-- | include/sysinfo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sysinfo.h b/include/sysinfo.h index 2e9a0c36f7d..32128c331fd 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -141,7 +141,7 @@ extern int CONFIG_UNSAFE_USER_PARAMETERS; #define ZBX_AVG15 2 #define ZBX_AVG_COUNT 3 -#ifdef _WINDOWS +#if defined(_WINDOWS) # define MAX_COLLECTOR_PERIOD (15 * SEC_PER_MIN) #endif @@ -283,7 +283,7 @@ int VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result); int VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result); int VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result); -#ifdef _WINDOWS +#if defined(_WINDOWS) || defined(__MINGW32__) int USER_PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result); int PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result); int PERF_COUNTER_EN(AGENT_REQUEST *request, AGENT_RESULT *result); @@ -302,7 +302,7 @@ int VM_VMEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result); #endif -#ifdef _WINDOWS +#if defined(_WINDOWS) || defined(__MINGW32__) typedef int (*zbx_metric_func_t)(AGENT_REQUEST *request, AGENT_RESULT *result, HANDLE timeout_event); #else typedef int (*zbx_metric_func_t)(AGENT_REQUEST *request, AGENT_RESULT *result); @@ -324,7 +324,7 @@ int zbx_execute_threaded_metric(zbx_metric_func_t metric_func, AGENT_REQUEST *re #define ZBX_SYSINFO_PROC_CMDLINE 0x0004 #define ZBX_SYSINFO_PROC_USER 0x0008 -#ifdef _WINDOWS +#if defined(_WINDOWS) || defined(__MINGW32__) #define ZBX_MUTEX_ALL_ALLOW 0 #define ZBX_MUTEX_THREAD_DENIED 1 #define ZBX_MUTEX_LOGGING_DENIED 2 |