From bd0ba148f74c83cf5677c0569f549cea023e721e Mon Sep 17 00:00:00 2001
From: Nick Gammon <nick@gammon.com.au>
Date: Sat, 7 Jan 2017 13:40:20 +1100
Subject: [PATCH] Removed more warnings

---
 MUSHclient.vcxproj | 4 ++--
 stdafx.h           | 1 +
 zlib/gzlib.c       | 5 -----
 zlib/readme.txt    | 8 --------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/MUSHclient.vcxproj b/MUSHclient.vcxproj
index cfae96c6..0ebfb2fd 100644
--- a/MUSHclient.vcxproj
+++ b/MUSHclient.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)luacom\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;LUA51;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;LUA51;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -122,7 +122,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/stdafx.h b/stdafx.h
index 772abf02..85aa14b5 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -21,6 +21,7 @@
 #pragma warning (disable : 4706)  // assignment within conditional expression
 #pragma warning (disable : 4710)  // function 'x' not inlined
 #pragma warning (disable : 4786)  // identifier was truncated to 'number' characters in the debug information
+#pragma warning (disable : 4996)  // MBCS support in MFC is deprecated and may be removed in a future version of MFC
 
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
diff --git a/zlib/gzlib.c b/zlib/gzlib.c
index 36e4afc6..fae202ef 100644
--- a/zlib/gzlib.c
+++ b/zlib/gzlib.c
@@ -1,8 +1,3 @@
-#define open _open      // POSIX compliance
-#define read _read      //    "
-#define write _write    //    "
-#define close _close    //    "
-
 /* gzlib.c -- zlib functions common to reading and writing gzip files
  * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
diff --git a/zlib/readme.txt b/zlib/readme.txt
index d49c25a2..95bfcd9a 100644
--- a/zlib/readme.txt
+++ b/zlib/readme.txt
@@ -50,11 +50,3 @@ add:
 #pragma warning( disable : 4131)  // uses old-style declarator
 #pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
 #pragma warning( disable : 4702)  // unreachable code
-
-
-5. Edit gzlib.c and at the start add the lines:
-
-#define open _open      // POSIX compliance
-#define read _read      //    "
-#define write _write    //    "
-#define close _close    //    "