- Tested and fixed resolve_hostbyname.

- Applied said function around most of the code where needed. Removed includes for the OS/network system pretty much from every file (our socket.c file should handle this)
- Added clif_getip_long, which returns the ip as a long. Prevents having to include the files to define the int_addr structure in all files that include clif.h
- Made the GM mute request bypass the manner_system setting.


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

1 files changed, 2 insertions, 11 deletions

diff --git a/src/map/clif.h b/src/map/clif.h
index 3143cafb8..91f82662e 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -4,15 +4,6 @@
 #ifndef _CLIF_H_

 #define _CLIF_H_

 

-#ifdef __WIN32

-typedef unsigned int in_addr_t;

-#else

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <netinet/in.h>

-#include <arpa/inet.h>

-#endif

-

 #include "map.h"

 

 // protocol version

@@ -57,11 +48,11 @@ enum {
 

 extern struct packet_db packet_db[MAX_PACKET_VER + 1][MAX_PACKET_DB];

 

-void clif_setip(char*);

+int clif_setip(char*);

 void clif_setbindip(char*);

 void clif_setport(int);

 

-in_addr_t clif_getip(void);

+unsigned long clif_getip_long(void);

 int clif_getport(void);

 int clif_countusers(void);

 void clif_setwaitclose(int);