diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-19 12:07:46 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-19 12:07:46 +0000 |
| commit | bbadd78fb2a0ef624b1503f647157f58e93ab474 (patch) | |
| tree | e8b09916e091a9882e858e3d6170e96514d17ba6 /include | |
| parent | 46e7eba7e031f101a82973caae71c2a0c1882cca (diff) | |
| download | zabbix-bbadd78fb2a0ef624b1503f647157f58e93ab474.tar.gz zabbix-bbadd78fb2a0ef624b1503f647157f58e93ab474.tar.xz zabbix-bbadd78fb2a0ef624b1503f647157f58e93ab474.zip | |
- tested and fixed jabber messager (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3836 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/cfg.h | 6 | ||||
| -rw-r--r-- | include/db.h | 2 | ||||
| -rw-r--r-- | include/mutexs.h | 4 | ||||
| -rw-r--r-- | include/zbxplugin.h | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/include/cfg.h b/include/cfg.h index 965f7dbe..c8d008d4 100644 --- a/include/cfg.h +++ b/include/cfg.h @@ -26,9 +26,9 @@ #define PARM_OPT 0 #define PARM_MAND 1 -// -// Application flags -// +/* + * Application flags + */ #define AF_STANDALONE 0x0001 #define AF_USE_EVENT_LOG 0x0002 diff --git a/include/db.h b/include/db.h index 2e08f680..bc66d860 100644 --- a/include/db.h +++ b/include/db.h @@ -263,7 +263,7 @@ DB_TRIGGER char *comments; int status; int value; -// int prevvalue; +/* int prevvalue; */ int priority; }; diff --git a/include/mutexs.h b/include/mutexs.h index d8d51ab8..fdd804fc 100644 --- a/include/mutexs.h +++ b/include/mutexs.h @@ -50,7 +50,9 @@ #endif /* _WINDOWS */ -int zbx_mutex_create(ZBX_MUTEX *mutex, ZBX_MUTEX_NAME name); +#define zbx_mutex_create(mutex, name) zbx_mutex_create_ext(mutex, name, 0) +#define zbx_mutex_create_force(mutex, name) zbx_mutex_create_ext(mutex, name, 1) +int zbx_mutex_create_ext(ZBX_MUTEX *mutex, ZBX_MUTEX_NAME name, unsigned char forced); int zbx_mutex_lock(ZBX_MUTEX *mutex); int zbx_mutex_unlock(ZBX_MUTEX *mutex); int zbx_mutex_destroy(ZBX_MUTEX *mutex); diff --git a/include/zbxplugin.h b/include/zbxplugin.h index cf8998af..e61516e7 100644 --- a/include/zbxplugin.h +++ b/include/zbxplugin.h @@ -43,13 +43,13 @@ typedef struct struct zbx_plugin_list { - struct zbx_plugin_list *next; // Pointer to next element in a chain + struct zbx_plugin_list *next; /* Pointer to next element in a chain */ - ZBX_MODULE hModule; // DLL module handle + ZBX_MODULE hModule; /* DLL module handle */ int runned; int (__zabbix_api * init)(char *,ZBX_PLUGIN_ARGS **); void (__zabbix_api * shutdown)(void); - ZBX_PLUGIN_ARGS *args; // List of subagent's commands + ZBX_PLUGIN_ARGS *args; /* List of subagent's commands */ }; typedef struct zbx_plugin_list ZBX_PLUGIN_LIST; |