diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-07-14 10:47:36 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-07-14 10:47:36 +0000 |
| commit | 66dd503fd985cd589744bda91a295a7301918084 (patch) | |
| tree | 2202ffd41d3d37d77951e436a23852f02c3b2632 /include | |
| parent | cd65966c616674fc508d28806b64d3dbcfb30a3f (diff) | |
| download | zabbix-66dd503fd985cd589744bda91a295a7301918084.tar.gz zabbix-66dd503fd985cd589744bda91a295a7301918084.tar.xz zabbix-66dd503fd985cd589744bda91a295a7301918084.zip | |
- added support of LDAP services monitoring for Win32 (Eugene)
- added support of "net.tcp.service.perf" for Win32 (Eugene)
- added support of "net.tcp.service" for Win32 (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3045 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 6 | ||||
| -rw-r--r-- | include/sysinc.h | 11 | ||||
| -rwxr-xr-x | include/zbxsock.h | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index a76c3443..6ca5930f 100644 --- a/include/common.h +++ b/include/common.h @@ -380,7 +380,11 @@ int get_param(const char *param, int num, char *buf, int maxlen); int num_param(const char *param); int calculate_item_nextcheck(int delay, int now); void zbx_setproctitle(const char *fmt, ...); -double zbx_getseconds(void); + +#define ZBX_JAN_1970_IN_SEC 2208988800.0 /* 1970 - 1900 in seconds */ +double zbx_time(void); +double zbx_current_time (void); + void zbx_error(const char *fmt, ...); int zbx_snprintf(char* str, size_t count, const char *fmt, ...); diff --git a/include/sysinc.h b/include/sysinc.h index a1356c1e..6967d936 100644 --- a/include/sysinc.h +++ b/include/sysinc.h @@ -109,6 +109,17 @@ #include <ldap.h> #endif +#ifdef HAVE_WINLDAP_H +# undef SEC_I_INCOMPLETE_CREDENTIALS +# undef SEC_E_INCOMPLETE_CREDENTIALS +# undef SEC_I_RENEGOTIATE +# include <Winldap.h> +#endif + +#ifdef HAVE_WINBER_H +# include <Winber.h> +#endif + #ifdef HAVE_MACH_HOST_INFO_H # include <mach/host_info.h> #endif diff --git a/include/zbxsock.h b/include/zbxsock.h index 52b4834c..1b211f03 100755 --- a/include/zbxsock.h +++ b/include/zbxsock.h @@ -57,13 +57,15 @@ typedef struct sockaddr_in ZBX_SOCKADDR; -int zbx_sock_read(ZBX_SOCKET sock, void *buf, int buflen, int timeout); -int zbx_sock_write(ZBX_SOCKET sock, void *buf, int buflen); +int zbx_sock_read(ZBX_SOCKET sock, void *buf, int buflen, int timeout); +int zbx_sock_write(ZBX_SOCKET sock, void *buf, int buflen); #if defined (WIN32) + int zbx_sock_init(void); # define zbx_sock_close(sock) closesocket(sock) # define zbx_sock_last_error() WSAGetLastError() #else /* not WIN32 */ +# define zbx_sock_init() SUCCEED # define zbx_sock_close(sock) close(sock) # define zbx_sock_last_error() errno #endif /* WIN32 */ |