From e0e7551d5608be97504d3ca74cf5f1e6eb2f04f9 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 17 Feb 2006 14:49:35 +0000
Subject: - 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5310 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt |  2 ++
 src/map/irc.c       | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index abb2b7bff..ba5114dc8 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 466adf745..7f512963f 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,12 +1,25 @@
+#include <ctype.h>
+#include <string.h>
+
+#ifdef __WIN32
+#define __USE_W32_SOCKETS
+#include <windows.h>
+#include <io.h>
+typedef int socklen_t;
+#else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
-#include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
+#include <arpa/inet.h>
+
+#ifndef SIOCGIFCONF
+#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
+#endif
+
+#endif
 
 #include "../common/core.h"
 #include "../common/socket.h"
-- 
cgit v1.2.3-70-g09d2