diff options
| author | Igors Homjakovs <git-no-reply@zabbix.com> | 2014-08-27 16:00:12 +0400 |
|---|---|---|
| committer | Igors Homjakovs <git-no-reply@zabbix.com> | 2014-08-27 16:00:12 +0400 |
| commit | db15767f4265884aa38a32e7221d09fc82ea2704 (patch) | |
| tree | fb444da9948891f6469f2a9cc9043188ab541d53 /include/log.h | |
| parent | d6a9b016cef06b02f69008928eaf2919f8b4f2e6 (diff) | |
| parent | b2f904fd02dffe332f24db5c8db1b48b709ff485 (diff) | |
...G...PS. [ZBXNEXT-101] updated to the latest trunk. resolved conflicts in include/log.h include/zbxtypes.h src/zabbix_proxy/housekeeper/housekeeper.c src/zabbix_proxy/proxy.c src/zabbix_server/housekeeper/housekeeper.c src/zabbix_server/httppoller/httptest.c src/zabbix_server/server.c src/zabbix_server/vmware/vmware.c
Diffstat (limited to 'include/log.h')
| -rw-r--r-- | include/log.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/log.h b/include/log.h index 938eb74d639..05285b7d8af 100644 --- a/include/log.h +++ b/include/log.h @@ -58,14 +58,16 @@ int zabbix_open_log(int type,int level, const char *filename); void zabbix_errlog(zbx_err_codes_t err, ...); void __zbx_zabbix_log(int level, const char *fmt, ...); void zabbix_close_log(); +void zabbix_set_log_level(int level); int set_debug_level_up(); int set_debug_level_down(); const char *get_debug_level_string(); int zabbix_check_log_level(int level); char *zbx_strerror(int errnum); char *strerror_from_system(unsigned long error); + #ifdef _WINDOWS -char *strerror_from_module(unsigned long error, LPCTSTR module); +char *strerror_from_module(unsigned long error, const wchar_t *module); #endif #if defined(_WINDOWS) |