From 5d67f33135a5305665f78307e03fa9aee7aa544b Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 13 May 2014 18:17:52 +0200 Subject: Removed trailing whitespace (sources) Signed-off-by: Haru --- src/common/winapi.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/common/winapi.h') diff --git a/src/common/winapi.h b/src/common/winapi.h index 7ce555049..b7c2bea1e 100644 --- a/src/common/winapi.h +++ b/src/common/winapi.h @@ -7,7 +7,7 @@ #define WINVER 0x0500 #define _WIN32_IE 0x0600 #define WIN32_LEAN_AND_MEAN -#define NOCOMM +#define NOCOMM #define NOKANJI #define NOHELP #define NOMCX @@ -32,5 +32,3 @@ #include #include #include - - -- cgit v1.2.3-70-g09d2 From c9b2545ebcf50e004c692ce087fc9ba253fcf525 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 7 Aug 2014 14:58:48 +0200 Subject: 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 --- src/char/inter.c | 1 + src/char/inter.h | 1 + src/common/showmsg.h | 2 ++ src/common/winapi.h | 1 + src/map/packets_struct.h | 1 + 5 files changed, 6 insertions(+) (limited to 'src/common/winapi.h') 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 +#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 #include 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" /** -- cgit v1.2.3-70-g09d2