summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-09 00:46:55 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-09 00:46:55 +0000
commitcc716ca00420c23bdb02831f8fc205d4588e1f75 (patch)
treeb7f3182f6e59f705eff9ee14ad35075fa52acf80 /src/map
parent4ae1b3c2a335d95a5425ecf5c19c5be2ab21e13a (diff)
downloadhercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.gz
hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.bz2
hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.xz
hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.zip
* Played around with MinGW a bit today...
- adjusted code so that it handles mingw-specific compatibility problems - adjusted the makefile, mingw is not a subset of cygwin * As an experiment Corrected many /W4 warnings on the txt login server git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10192 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/Makefile2
-rw-r--r--src/map/atcommand.c1
-rw-r--r--src/map/charcommand.c1
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/irc.c1
-rw-r--r--src/map/map.h14
-rw-r--r--src/map/mercenary.c1
-rw-r--r--src/map/npc.c1
-rw-r--r--src/map/npc_chat.c1
-rw-r--r--src/map/pc.c1
-rw-r--r--src/map/script.c1
-rw-r--r--src/map/status.c1
12 files changed, 7 insertions, 19 deletions
diff --git a/src/map/Makefile b/src/map/Makefile
index 10af86c8f..2a25528eb 100644
--- a/src/map/Makefile
+++ b/src/map/Makefile
@@ -40,7 +40,7 @@ sqlobj/%.o: %.c
$(COMPILE.c) $(OUTPUT_OPTION) $<
clean:
- rm -rf *.o ../../map-server ../../map-server_sql sqlobj txtobj
+ rm -rf *.o ../../map-server ../../map-server_sql sqlobj txtobj GNUmakefile
# DO NOT DELETE
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 6acd8334f..77b1edf0c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <math.h>
#include "../common/cbasetypes.h"
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 415f216d5..209116bc4 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <math.h>
#include "../common/cbasetypes.h"
diff --git a/src/map/clif.c b/src/map/clif.c
index 92361d4e9..a4ba467ed 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5,7 +5,6 @@
#define DUMP_ALL_PACKETS 0
#include <stdio.h>
-#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
diff --git a/src/map/irc.c b/src/map/irc.c
index 863631394..b024137e0 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,7 +1,6 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/map/map.h b/src/map/map.h
index 468f7a7d6..bf748df3b 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -828,8 +828,8 @@ struct npc_data {
short n;
short class_;
short speed;
- unsigned char name[NAME_LENGTH];
- unsigned char exname[NAME_LENGTH];
+ char name[NAME_LENGTH];
+ char exname[NAME_LENGTH];
int chat_id;
unsigned int next_walktime;
@@ -1243,8 +1243,8 @@ enum {
struct chat_data {
struct block_list bl;
- unsigned char pass[8+1]; /* password */
- unsigned char title[60+1]; /* room title */
+ char pass[8+1]; /* password */
+ char title[60+1]; /* room title */
unsigned char limit; /* join limit */
unsigned char trigger;
unsigned char users; /* current users */
@@ -1405,10 +1405,8 @@ extern char *map_server_dns;
#ifndef TXT_ONLY
-// MySQL
-#ifdef __WIN32
-#include <my_global.h>
-#include <my_sys.h>
+#ifdef _WIN32
+#include <windows.h> // SOCKET
#endif
#include <mysql.h>
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index c21a8721d..899764ec8 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <math.h>
#include "../common/cbasetypes.h"
diff --git a/src/map/npc.c b/src/map/npc.c
index faee6fc10..941eec4c8 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -3,7 +3,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
#include <math.h>
#include <time.h>
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 6288714bc..f5a7762d6 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -4,7 +4,6 @@
#ifdef PCRE_SUPPORT
#include <stdio.h>
-#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
diff --git a/src/map/pc.c b/src/map/pc.c
index 22bccbb00..eca06237d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <time.h>
#include "../common/cbasetypes.h"
diff --git a/src/map/script.c b/src/map/script.c
index c305bf6ec..afa7146b0 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <math.h>
#ifndef WIN32
#include <sys/time.h>
diff --git a/src/map/status.c b/src/map/status.c
index efba2b497..c2445bde2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2,7 +2,6 @@
// For more information, see LICENCE in the main folder
#include <time.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <memory.h>