From c9b2545ebcf50e004c692ce087fc9ba253fcf525 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
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 <haru@dotalux.com>
---
 src/common/showmsg.h | 2 ++
 src/common/winapi.h  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/common')

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>
-- 
cgit v1.2.3-60-g2f50