diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-20 09:41:20 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-20 09:41:20 +0000 |
| commit | fad91b96b5a85f0e25badf0945216ecc5478909e (patch) | |
| tree | 766d1e9d8b30bebe884e0b9c7a03e32fb5ae2189 /include | |
| parent | 20a163cabd95d251d7c97b34ceb06164502af1b8 (diff) | |
| download | zabbix-fad91b96b5a85f0e25badf0945216ecc5478909e.tar.gz zabbix-fad91b96b5a85f0e25badf0945216ecc5478909e.tar.xz zabbix-fad91b96b5a85f0e25badf0945216ecc5478909e.zip | |
- merged rev. 4620:4621 of branches/1.4.2 (Eugene) [added 'system.cpu.num[]' for WinXX]
git-svn-id: svn://svn.zabbix.com/trunk@4623 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/comms.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/comms.h b/include/comms.h index 5b350a4e..50ecde1f 100644 --- a/include/comms.h +++ b/include/comms.h @@ -26,11 +26,11 @@ typedef enum { } zbx_tcp_errors; -#if defined(SOCKET) +#if defined(SOCKET) || defined(_WINDOWS) typedef SOCKET ZBX_SOCKET; -#else /* not SOCKET */ +#else /* not SOCKET && not _WINDOWS*/ typedef int ZBX_SOCKET; -#endif /* SOCKET */ +#endif /* SOCKET || _WINDOWS */ typedef struct sockaddr_in ZBX_SOCKADDR; @@ -57,7 +57,10 @@ char* zbx_tcp_strerror(void); int zbx_tcp_error(void); struct hostent *zbx_gethost(const char *hostname); + +#if !defined(_WINDOWS) struct hostent *zbx_gethost_by_ip(const char *ip); +#endif /* WINDOWS */ void zbx_tcp_init(zbx_sock_t *s, ZBX_SOCKET o); int zbx_tcp_connect(zbx_sock_t *s, const char *ip, unsigned short port); |