summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-08-07 14:58:48 +0200
committerHaru <haru@dotalux.com>2014-08-07 14:58:48 +0200
commitc9b2545ebcf50e004c692ce087fc9ba253fcf525 (patch)
treece5e09104a37a155e61b1cd125ca42e9596a4ebb
parent7c6f45590e10ff0002830418fcff604c90bafb8a (diff)
downloadhercules-c9b2545ebcf50e004c692ce087fc9ba253fcf525.tar.gz
hercules-c9b2545ebcf50e004c692ce087fc9ba253fcf525.tar.bz2
hercules-c9b2545ebcf50e004c692ce087fc9ba253fcf525.tar.xz
hercules-c9b2545ebcf50e004c692ce087fc9ba253fcf525.zip
Fixed some MSVC incompatibilities
- Resolves bugreport:8289 http://hercules.ws/board/tracker/issue-8289-compile-error-vs-2013/ - Disables some winsock-related deprecation warnings. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/char/inter.c1
-rw-r--r--src/char/inter.h1
-rw-r--r--src/common/showmsg.h2
-rw-r--r--src/common/winapi.h1
-rw-r--r--src/map/packets_struct.h1
5 files changed, 6 insertions, 0 deletions
diff --git a/src/char/inter.c b/src/char/inter.c
index ab53fc6da..a7794c9c9 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -23,6 +23,7 @@
#include "int_pet.h"
#include "int_quest.h"
#include "int_storage.h"
+#include "../common/cbasetypes.h"
#include "../common/db.h"
#include "../common/malloc.h"
#include "../common/mmo.h"
diff --git a/src/char/inter.h b/src/char/inter.h
index 0bea21363..d7d7c3c2b 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -6,6 +6,7 @@
#define CHAR_INTER_H
#include "char.h"
+#include "../common/cbasetypes.h"
#include "../common/sql.h"
struct accreg;
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 4300c29d6..f3fb50257 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -7,6 +7,8 @@
#include <stdarg.h>
+#include "../common/cbasetypes.h"
+
#ifdef HERCULES_CORE
# include "../../3rdparty/libconfig/libconfig.h"
#else
diff --git a/src/common/winapi.h b/src/common/winapi.h
index b7c2bea1e..a8a38f30e 100644
--- a/src/common/winapi.h
+++ b/src/common/winapi.h
@@ -24,6 +24,7 @@
#define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_WARNINGS
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
#include <io.h>
#include <Windows.h>
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 55ab0c66a..b32baf53a 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -6,6 +6,7 @@
#ifndef MAP_PACKETS_STRUCT_H
#define MAP_PACKETS_STRUCT_H
+#include "../common/cbasetypes.h"
#include "../common/mmo.h"
/**