Skip to content

Commit a570a4e

Browse files
committed
Trying to get rid of zlib warnings
1 parent bd0ba14 commit a570a4e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

MUSHclient.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ClCompile>
7474
<Optimization>Disabled</Optimization>
7575
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)luacom\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
76-
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;LUA51;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
76+
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;LUA51;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<MinimalRebuild>true</MinimalRebuild>
7878
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
7979
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -122,7 +122,7 @@
122122
<Optimization>MaxSpeed</Optimization>
123123
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
124124
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125-
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<StringPooling>true</StringPooling>
127127
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
128128
<FunctionLevelLinking>true</FunctionLevelLinking>

zlib/readme.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ add:
5050
#pragma warning( disable : 4131) // uses old-style declarator
5151
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
5252
#pragma warning( disable : 4702) // unreachable code
53+
#define WINAPI_FAMILY 1
54+

zlib/zlib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#pragma warning( disable : 4131) // uses old-style declarator
44
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
55
#pragma warning( disable : 4702) // unreachable code
6+
#define WINAPI_FAMILY 1
67

78
/* zlib.h -- interface of the 'zlib' general purpose compression library
89
version 1.2.8, April 28th, 2013

0 commit comments

Comments
 (0)