From f0c78186b6c737821eb10f66c8847bdf71dd8cae Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 17 Feb 2006 14:49:35 +0000 Subject: [PATCH] - Modified the included files in irc.c, used as reference the includes in common/socket.c, will it compile in Windows systems now? git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5310 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/irc.c | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index abb2b7bff7..ba5114dc82 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/17 + * Changed around the included files in irc.c to see if it compiles under + Win32 native. [Skotlex] * Char-SQL server updates: [Skotlex] - Removed the unnecessary party/guild check on each char-save. - Removed the 'quick loaded char' messages. diff --git a/src/map/irc.c b/src/map/irc.c index 466adf745f..7f512963fe 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -1,12 +1,25 @@ +#include +#include + +#ifdef __WIN32 +#define __USE_W32_SOCKETS +#include +#include +typedef int socklen_t; +#else #include #include #include -#include -#include -#include #include -#include -#include +#include +#include +#include + +#ifndef SIOCGIFCONF +#include // SIOCGIFCONF on Solaris, maybe others? [Shinomori] +#endif + +#endif #include "../common/core.h" #include "../common/socket.h"