diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | 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"
|