From 250672ef201106afb563a2e3bbd79a4ab98d13cc Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Sat, 6 Jan 2007 12:11:50 +0000 Subject: - Now winsock 2 is required. - Cleaned up do_close and socket_init a bit. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9621 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/socket.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/common/socket.h') diff --git a/src/common/socket.h b/src/common/socket.h index cb1e1c15f..5d6fcff89 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -4,20 +4,21 @@ #ifndef _SOCKET_H_ #define _SOCKET_H_ -#include +#include "../common/cbasetypes.h" -#ifdef __WIN32 -#define __USE_W32_SOCKETS -#include -typedef long in_addr_t; +#ifdef WIN32 + #define __USE_W32_SOCKETS + #include + typedef long in_addr_t; #else -#include -#include -#include + #include + #include + #include #endif + +#include #include #include "../common/malloc.h" -#include "cbasetypes.h" extern time_t last_tick; extern time_t stall_time; @@ -180,6 +181,8 @@ void set_defaultconsoleparse(int (*defaultparse)(char*)); //ip_str is a char[16] where the whole ip is stored in string notation (optional) in_addr_t resolve_hostbyname(char* hostname, unsigned char *ip, char *ip_str); -extern unsigned int addr_[16]; // ip addresses of local host (host byte order) -extern unsigned int naddr_; // # of ip addresses +int socket_getips(uint32 *ips, int max); + +extern uint32 addr_[16]; // ip addresses of local host (host byte order) +extern int naddr_; // # of ip addresses #endif // _SOCKET_H_ -- cgit v1.2.3-70-g09d2