diff options
| author | Armands Arseniuss Skolmeisters <armands.skolmeisters@zabbix.com> | 2022-10-26 15:39:57 +0300 |
|---|---|---|
| committer | Armands Arseniuss Skolmeisters <armands.skolmeisters@zabbix.com> | 2022-10-26 15:48:19 +0300 |
| commit | 78f09c456f02655bd6b1ebaafe4676828f3a6ed7 (patch) | |
| tree | 1da5cbd94c8a2dd70039d1c5877174d96ef7e13b /include | |
| parent | 6c11a0f2d189363b13f94cfa4ec8501c049fcb34 (diff) | |
...G...... [DEV-2302] removed external references from zbxwin32 and zbxwinservice libraries
Diffstat (limited to 'include')
| -rw-r--r-- | include/zbxcommon.h | 1 | ||||
| -rw-r--r-- | include/zbxwin32.h | 8 | ||||
| -rw-r--r-- | include/zbxwinservice.h | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/zbxcommon.h b/include/zbxcommon.h index a950e280195..284cffb1286 100644 --- a/include/zbxcommon.h +++ b/include/zbxcommon.h @@ -834,6 +834,7 @@ void zbx_version(void); const char *get_program_name(const char *path); typedef unsigned char (*zbx_get_program_type_f)(void); +typedef const char *(*zbx_get_progname_f)(void); typedef enum { diff --git a/include/zbxwin32.h b/include/zbxwin32.h index 104d4d9cd42..db7b7cc67ea 100644 --- a/include/zbxwin32.h +++ b/include/zbxwin32.h @@ -23,11 +23,15 @@ #include "config.h" #include "zbxsysinc.h" #include "zbxtypes.h" +#include "zbxcommon.h" #if !defined(_WINDOWS) && !defined(__MINGW32__) # error "This module is only available for Windows OS" #endif +#define get_builtin_object_name(ctr) zbx_get_counter_name(zbx_get_builtin_object_index(ctr)) +#define get_builtin_counter_name(ctr) zbx_get_counter_name(zbx_get_builtin_counter_index(ctr)) + /* this struct must be only modified along with mapping builtin_counter_ref[] in perfmon.c */ typedef enum { @@ -101,7 +105,7 @@ DWORD zbx_get_builtin_object_index(zbx_builtin_counter_ref_t counter_ref); DWORD zbx_get_builtin_counter_index(zbx_builtin_counter_ref_t counter_ref); wchar_t *zbx_get_all_counter_names(HKEY reg_key, wchar_t *reg_value_name); -#define get_builtin_object_name(ctr) zbx_get_counter_name(zbx_get_builtin_object_index(ctr)) -#define get_builtin_counter_name(ctr) zbx_get_counter_name(zbx_get_builtin_counter_index(ctr)) +void zbx_win_exception_init(zbx_get_progname_f get_progname); +int zbx_win_exception_filter(struct _EXCEPTION_POINTERS *ep); #endif /* ZABBIX_WIN32_H */ diff --git a/include/zbxwinservice.h b/include/zbxwinservice.h index c584a24b9b6..bb2de1e2ed1 100644 --- a/include/zbxwinservice.h +++ b/include/zbxwinservice.h @@ -26,7 +26,7 @@ #include "zbxthreads.h" -extern ZBX_THREAD_HANDLE *threads; +typedef void (*zbx_on_exit_t)(int); void zbx_service_start(int flags); @@ -35,7 +35,6 @@ int ZabbixRemoveService(void); int ZabbixStartService(void); int ZabbixStopService(void); -typedef void (*zbx_on_exit_t)(int); void zbx_set_parent_signal_handler(zbx_on_exit_t zbx_on_exit_cb_arg); int ZBX_IS_RUNNING(void); |