Cleaning up of the socket code

- Shuffled includes around for files that were leeching off of socket.h
- Added code that enforces standard shutdown behavior for sockets

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9817 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 8 insertions, 1 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 016801119..c7ad31805 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9347,7 +9347,7 @@ int atcommand_homhungry(const int fd, struct map_session_data* sd, const char* c
 }
 
 /*==========================================
- * modify homunculus hunger [orn]
+ * make the homunculus speak [orn]
  *------------------------------------------
  */
 int atcommand_homtalk(const int fd, struct map_session_data* sd, const char* command, const char* message)
diff --git a/src/map/irc.c b/src/map/irc.c
index 9989c3c31..55eafdcd9 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,4 +1,8 @@
+#ifndef _IRC_H_
+#define _IRC_H_
+
 #include <ctype.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -541,3 +545,5 @@ int irc_read_conf(char *file) {
 
 	return 1;
 }
+
+#endif //_IRC_H_
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index cb502d8af..f7799e500 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -5,6 +5,7 @@
 #include <math.h>
 
 #include "../common/cbasetypes.h"
+#include "../common/malloc.h"
 #include "../common/socket.h"
 #include "../common/timer.h"
 #include "../common/nullpo.h"