diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-02 12:33:05 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-02 12:33:05 +0000 |
| commit | 47dd5d05f5a65efb65c9c674d23eb6aa88aaa42e (patch) | |
| tree | 0854bf902030cea22a6de25c8a1e61180448c762 /include | |
| parent | 214f5afd22f1f8cb4cc15532f48710730ade2316 (diff) | |
- [DEV-92] added supprt of multiple windows agents, service description
[svn merge svn://svn.zabbix.com/branches/1.4.j -r5208:5211]
git-svn-id: svn://svn.zabbix.com/trunk@5212 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 15 | ||||
| -rw-r--r-- | include/service.h | 3 |
2 files changed, 15 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 7c7c45d6..88cf8512 100644 --- a/include/common.h +++ b/include/common.h @@ -125,6 +125,11 @@ #define ZABBIX_VERSION "1.5" #if defined(_WINDOWS) +extern char ZABBIX_SERVICE_NAME[64]; +extern char ZABBIX_EVENT_SOURCE[64]; +#endif /* _WINDOWS */ + +#if defined(_WINDOWS) /*# pragma warning (disable: 4100)*/ # pragma warning (disable: 4996) /* warning C4996: <function> was declared deprecated */ #endif /* _WINDOWS */ @@ -524,6 +529,16 @@ typedef enum ZBX_TASK_CHANGE_NODEID } zbx_task_t; +#define ZBX_TASK_FLAG_MULTIPLE_AGENTS 0x01 + +#define ZBX_TASK_EX struct zbx_task_ex +ZBX_TASK_EX +{ + zbx_task_t task; + int flags; +}; + + char *string_replace(char *str, char *sub_str1, char *sub_str2); void del_zeroes(char *s); diff --git a/include/service.h b/include/service.h index a9075468..5c813f2a 100644 --- a/include/service.h +++ b/include/service.h @@ -28,9 +28,6 @@ extern ZBX_THREAD_HANDLE *threads; -#define ZABBIX_SERVICE_NAME APPLICATION_NAME -#define ZABBIX_EVENT_SOURCE APPLICATION_NAME - void service_start(void); int ZabbixCreateService(char *execName); |