[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: VC++ 2005 Express build

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-12-16 20:03:22 CET

D.J. Heap wrote:
> On 12/15/05, Stefan Küng <tortoisesvn@gmail.com> wrote:
> [snip]
>> Even though gen-make.py has a --VSNET2005 switch, it doesn't work. You
>> still have to open the solution file and _convert_ all the generated
>> project files to VS.NET2005.
>
> It's been working for me every night for months with no conversion
> required. Are you saying that when you bring the solution up in the
> IDE it brings up the conversion wizard? Is this with Express?

Last time I tried, it wouldn't build without converting the project
files first. Seems I should be trying the TSVN build without my
automatic patches from time to time :)

What still bothers me (no big deal, but annoying) are the hundreds of
warnings VS.NET2005 produces while building Subversion. Attached is a
patch which will simply silence those warnings by setting the
corresponding preprocessor define in the project files.

Also attached is a modified file to build the zlib. I copy that file to
zlib\contrib\masmx86 (and zlib/, because the nmake script doesn't
overwrite an old version of that file if it's already there). Maybe you
want to include that in your own build process too?
It won't interfere with VS.NET2003.

The third file attached is a patched makefile for the apr-iconv modules.
It silences the warnings generated for each linked *.so module and also
embeds the manifest file needed if built with the CRT80 (which comes
with VS.NET2005). It's not really necessary, but I'd rather have the
manifest inside the modules than to ship a separate *.manifest file for
each *.so module.
This should of course only be used if compiled with VS.NET2005 -
VS.NET2003 doesn't have the mt tool required for this.

I also had to patch neon.mak (enclose the paths to the tools in quotes),
otherwise VS.NET2005 doesn't find them if the path has spaces in them
(which is usually the case, because it installs to "program
files\Microsoft Visual Studio 8").

At least I don't have to patch any Subversion files anymore to get a
successful automated build :)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

[[[
Set preprocessor defines to silence compiler warnings with VS.NET2005.

* build/generator/gen_uri_delims.vcproj.ezt
  build/generator/libapr.vcproj.ezt
  build/generator/libapriconv.vcproj.ezt
  build/generator/libaprutil.vcproj.ezt
  build/generator/vcnet_vcproj.ezt
  build/generator/xml.vcproj.ezt
]]]
Index: generator/gen_uri_delims.vcproj.ezt
===================================================================
--- generator/gen_uri_delims.vcproj.ezt (revision 17812)
+++ generator/gen_uri_delims.vcproj.ezt (working copy)
@@ -21,7 +21,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\Debug/gen_uri_delims.pch"
                                 AssemblerListingLocation=".\Debug/"
@@ -72,7 +72,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
Index: generator/libapr.vcproj.ezt
===================================================================
--- generator/libapr.vcproj.ezt (revision 17812)
+++ generator/libapr.vcproj.ezt (working copy)
@@ -21,7 +21,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\Debug/libapr.pch"
                                 AssemblerListingLocation=".\Debug/"
@@ -79,7 +79,7 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
                                 AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
@@ -146,7 +146,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -154,7 +154,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -169,7 +169,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -177,7 +177,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -188,7 +188,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -196,7 +196,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -207,7 +207,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -215,7 +215,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -226,7 +226,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -234,7 +234,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -245,7 +245,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -253,7 +253,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -264,7 +264,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -272,7 +272,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -283,7 +283,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -291,7 +291,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -302,7 +302,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -310,7 +310,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -321,7 +321,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -329,7 +329,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -340,7 +340,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -348,7 +348,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -359,7 +359,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -367,7 +367,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -378,7 +378,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -386,7 +386,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -397,7 +397,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -405,7 +405,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -416,7 +416,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -424,7 +424,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -435,7 +435,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -443,7 +443,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -454,7 +454,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -462,7 +462,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -477,7 +477,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -485,7 +485,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -496,7 +496,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -504,7 +504,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -515,7 +515,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -523,7 +523,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -534,7 +534,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -542,7 +542,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -557,7 +557,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -565,7 +565,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -581,7 +581,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32"
@@ -590,7 +590,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -601,7 +601,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -609,7 +609,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -620,7 +620,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -628,7 +628,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -639,7 +639,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -647,7 +647,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -658,7 +658,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -666,7 +666,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -677,7 +677,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -685,7 +685,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -696,7 +696,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -704,7 +704,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -715,7 +715,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -723,7 +723,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -734,7 +734,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -742,7 +742,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -753,7 +753,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -761,7 +761,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -772,7 +772,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -780,7 +780,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -791,7 +791,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -799,7 +799,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -814,7 +814,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -822,7 +822,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -833,7 +833,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -841,7 +841,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -856,7 +856,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -864,7 +864,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -875,7 +875,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -883,7 +883,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -894,7 +894,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -902,7 +902,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -913,7 +913,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -921,7 +921,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -932,7 +932,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -940,7 +940,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -951,7 +951,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -959,7 +959,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -970,7 +970,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -989,7 +989,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -997,7 +997,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1012,7 +1012,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1020,7 +1020,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1035,7 +1035,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1043,7 +1043,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1058,7 +1058,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1066,7 +1066,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1077,7 +1077,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1085,7 +1085,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1096,7 +1096,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1104,7 +1104,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1115,7 +1115,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1123,7 +1123,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1134,7 +1134,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1142,7 +1142,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1153,7 +1153,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1161,7 +1161,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1176,7 +1176,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1184,7 +1184,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1195,7 +1195,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1203,7 +1203,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1218,7 +1218,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1226,7 +1226,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1237,7 +1237,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1245,7 +1245,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1256,7 +1256,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1264,7 +1264,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1275,7 +1275,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1283,7 +1283,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1298,7 +1298,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1306,7 +1306,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1317,7 +1317,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1325,7 +1325,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1336,7 +1336,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1344,7 +1344,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -1359,7 +1359,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1367,7 +1367,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -1378,7 +1378,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -1386,7 +1386,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
Index: generator/libapriconv.vcproj.ezt
===================================================================
--- generator/libapriconv.vcproj.ezt (revision 17812)
+++ generator/libapriconv.vcproj.ezt (working copy)
@@ -21,7 +21,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="./include,../apr/include"
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\Debug/libapriconv.pch"
                                 AssemblerListingLocation=".\Debug/"
@@ -78,7 +78,7 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
                                 AdditionalIncludeDirectories="./include,../apr/include"
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
@@ -144,7 +144,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -152,7 +152,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -163,7 +163,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -171,7 +171,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -182,7 +182,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -190,7 +190,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -201,7 +201,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -209,7 +209,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -220,7 +220,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -228,7 +228,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -239,7 +239,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -247,7 +247,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -258,7 +258,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -266,7 +266,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
Index: generator/libaprutil.vcproj.ezt
===================================================================
--- generator/libaprutil.vcproj.ezt (revision 17812)
+++ generator/libaprutil.vcproj.ezt (working copy)
@@ -21,7 +21,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\Debug/libaprutil.pch"
                                 AssemblerListingLocation=".\Debug/"
@@ -79,7 +79,7 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
                                 AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
@@ -146,7 +146,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -154,7 +154,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -165,7 +165,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -173,7 +173,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -184,7 +184,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -192,7 +192,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -203,7 +203,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -211,7 +211,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -222,7 +222,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -230,7 +230,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -241,7 +241,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -249,7 +249,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -260,7 +260,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -268,7 +268,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -279,7 +279,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -287,7 +287,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -298,7 +298,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -306,7 +306,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -317,7 +317,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -325,7 +325,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -336,7 +336,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -344,7 +344,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -355,7 +355,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -363,7 +363,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -374,7 +374,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -382,7 +382,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -397,7 +397,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -405,7 +405,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -416,7 +416,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -424,7 +424,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -435,7 +435,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -443,7 +443,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -454,7 +454,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -462,7 +462,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -473,7 +473,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -481,7 +481,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -496,7 +496,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -504,7 +504,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -515,7 +515,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -523,7 +523,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -534,7 +534,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -542,7 +542,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -553,7 +553,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -561,7 +561,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -576,7 +576,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -584,7 +584,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -599,7 +599,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -607,7 +607,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -622,7 +622,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -630,7 +630,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -641,7 +641,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -649,7 +649,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -664,7 +664,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -672,7 +672,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -683,7 +683,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -691,7 +691,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -702,7 +702,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -710,7 +710,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -721,7 +721,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -729,7 +729,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -744,7 +744,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -752,7 +752,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -763,7 +763,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -771,7 +771,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -782,7 +782,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -790,7 +790,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -801,7 +801,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -809,7 +809,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                                 <File
@@ -833,7 +833,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -841,7 +841,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -856,7 +856,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -864,7 +864,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -879,7 +879,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -887,7 +887,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
@@ -902,7 +902,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="0"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                         <FileConfiguration
                                                 Name="Release|Win32">
@@ -910,7 +910,7 @@
                                                         Name="VCCLCompilerTool"
                                                         Optimization="2"
                                                         AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;$(NoInherit)"/>
                                         </FileConfiguration>
                                 </File>
                         </Filter>
Index: generator/vcnet_vcproj.ezt
===================================================================
--- generator/vcnet_vcproj.ezt (revision 17812)
+++ generator/vcnet_vcproj.ezt (working copy)
@@ -25,7 +25,7 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
 [end] AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
- PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end]"
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end]"
 [is configs.name "Debug"] MinimalRebuild="TRUE"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="TRUE"
Index: generator/xml.vcproj.ezt
===================================================================
--- generator/xml.vcproj.ezt (revision 17812)
+++ generator/xml.vcproj.ezt (working copy)
@@ -23,7 +23,7 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
                                 AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
@@ -67,7 +67,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\LibD/xml.pch"
                                 AssemblerListingLocation=".\LibD/"

;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding
; *
; * inffas32.asm is derivated from inffas86.c, with translation of assembly code
; *
; * Copyright (C) 1995-2003 Mark Adler
; * For conditions of distribution and use, see copyright notice in zlib.h
; *
; * Copyright (C) 2003 Chris Anderson <christop@charm.net>
; * Please use the copyright conditions above.
; *
; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
; * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at
; * the moment. I have successfully compiled and tested this code with gcc2.96,
; * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S
; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
; * enabled. I will attempt to merge the MMX code into this version. Newer
; * versions of this and inffast.S can be found at
; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
; *
; * 2005 : modification by Gilles Vollant
; */
; For Visual C++ 4.x and higher and ML 6.x and higher
; ml.exe is in directory \MASM611C of Win95 DDK
; ml.exe is also distributed in http://www.masm32.com/masmdl.htm
; and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/
;
;
; compile with command line option
; ml /coff /Zi /c /Flinffas32.lst inffas32.asm

; if you define NO_GZIP (see inflate.h), compile with
; ml /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm

; zlib122sup is 0 fort zlib 1.2.2.1 and lower
; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head
; in inflate_state in inflate.h)
zlib1222sup equ 8

IFDEF GUNZIP
  INFLATE_MODE_TYPE equ 11
  INFLATE_MODE_BAD equ 26
ELSE
  IFNDEF NO_GUNZIP
    INFLATE_MODE_TYPE equ 11
    INFLATE_MODE_BAD equ 26
  ELSE
    INFLATE_MODE_TYPE equ 3
    INFLATE_MODE_BAD equ 17
  ENDIF
ENDIF

; 75 "inffast.S"
;FILE "inffast.S"

;;;GLOBAL _inflate_fast

;;;SECTION .text

        .586p
        .mmx

        name inflate_fast_x86
        .MODEL FLAT

_DATA segment
inflate_fast_use_mmx:
        dd 1

_TEXT segment
PUBLIC _inflate_fast

ALIGN 4
_inflate_fast:
        jmp inflate_fast_entry

ALIGN 4
        db 'Fast decoding Code from Chris Anderson'
        db 0

ALIGN 4
invalid_literal_length_code_msg:
        db 'invalid literal/length code'
        db 0

ALIGN 4
invalid_distance_code_msg:
        db 'invalid distance code'
        db 0

ALIGN 4
invalid_distance_too_far_msg:
        db 'invalid distance too far back'
        db 0

ALIGN 4
inflate_fast_mask:
dd 0
dd 1
dd 3
dd 7
dd 15
dd 31
dd 63
dd 127
dd 255
dd 511
dd 1023
dd 2047
dd 4095
dd 8191
dd 16383
dd 32767
dd 65535
dd 131071
dd 262143
dd 524287
dd 1048575
dd 2097151
dd 4194303
dd 8388607
dd 16777215
dd 33554431
dd 67108863
dd 134217727
dd 268435455
dd 536870911
dd 1073741823
dd 2147483647
dd 4294967295

mode_state equ 0 ;/* state->mode */
wsize_state equ (32+zlib1222sup) ;/* state->wsize */
write_state equ (36+4+zlib1222sup) ;/* state->write */
window_state equ (40+4+zlib1222sup) ;/* state->window */
hold_state equ (44+4+zlib1222sup) ;/* state->hold */
bits_state equ (48+4+zlib1222sup) ;/* state->bits */
lencode_state equ (64+4+zlib1222sup) ;/* state->lencode */
distcode_state equ (68+4+zlib1222sup) ;/* state->distcode */
lenbits_state equ (72+4+zlib1222sup) ;/* state->lenbits */
distbits_state equ (76+4+zlib1222sup) ;/* state->distbits */

;;SECTION .text
; 205 "inffast.S"
;GLOBAL inflate_fast_use_mmx

;SECTION .data

; GLOBAL inflate_fast_use_mmx:object
;.size inflate_fast_use_mmx, 4
; 226 "inffast.S"
;SECTION .text

ALIGN 4
inflate_fast_entry:
        push edi
        push esi
        push ebp
        push ebx
        pushfd
        sub esp,64
        cld

        mov esi, [esp+88]
        mov edi, [esi+28]

        mov edx, [esi+4]
        mov eax, [esi+0]

        add edx,eax
        sub edx,11

        mov [esp+44],eax
        mov [esp+20],edx

        mov ebp, [esp+92]
        mov ecx, [esi+16]
        mov ebx, [esi+12]

        sub ebp,ecx
        neg ebp
        add ebp,ebx

        sub ecx,257
        add ecx,ebx

        mov [esp+60],ebx
        mov [esp+40],ebp
        mov [esp+16],ecx
; 285 "inffast.S"
        mov eax, [edi+lencode_state]
        mov ecx, [edi+distcode_state]

        mov [esp+8],eax
        mov [esp+12],ecx

        mov eax,1
        mov ecx, [edi+lenbits_state]
        shl eax,cl
        dec eax
        mov [esp+0],eax

        mov eax,1
        mov ecx, [edi+distbits_state]
        shl eax,cl
        dec eax
        mov [esp+4],eax

        mov eax, [edi+wsize_state]
        mov ecx, [edi+write_state]
        mov edx, [edi+window_state]

        mov [esp+52],eax
        mov [esp+48],ecx
        mov [esp+56],edx

        mov ebp, [edi+hold_state]
        mov ebx, [edi+bits_state]
; 321 "inffast.S"
        mov esi, [esp+44]
        mov ecx, [esp+20]
        cmp ecx,esi
        ja L_align_long

        add ecx,11
        sub ecx,esi
        mov eax,12
        sub eax,ecx
        lea edi, [esp+28]
        rep movsb
        mov ecx,eax
        xor eax,eax
        rep stosb
        lea esi, [esp+28]
        mov [esp+20],esi
        jmp L_is_aligned

L_align_long:
        test esi,3
        jz L_is_aligned
        xor eax,eax
        mov al, [esi]
        inc esi
        mov ecx,ebx
        add ebx,8
        shl eax,cl
        or ebp,eax
        jmp L_align_long

L_is_aligned:
        mov edi, [esp+60]
; 366 "inffast.S"
L_check_mmx:
        cmp dword ptr [inflate_fast_use_mmx],2
        je L_init_mmx
        ja L_do_loop

        push eax
        push ebx
        push ecx
        push edx
        pushfd
        mov eax, [esp]
        xor dword ptr [esp],0200000h

        popfd
        pushfd
        pop edx
        xor edx,eax
        jz L_dont_use_mmx
        xor eax,eax
        cpuid
        cmp ebx,0756e6547h
        jne L_dont_use_mmx
        cmp ecx,06c65746eh
        jne L_dont_use_mmx
        cmp edx,049656e69h
        jne L_dont_use_mmx
        mov eax,1
        cpuid
        shr eax,8
        and eax,15
        cmp eax,6
        jne L_dont_use_mmx
        test edx,0800000h
        jnz L_use_mmx
        jmp L_dont_use_mmx
L_use_mmx:
        mov dword ptr [inflate_fast_use_mmx],2
        jmp L_check_mmx_pop
L_dont_use_mmx:
        mov dword ptr [inflate_fast_use_mmx],3
L_check_mmx_pop:
        pop edx
        pop ecx
        pop ebx
        pop eax
        jmp L_check_mmx
; 426 "inffast.S"
ALIGN 4
L_do_loop:
; 437 "inffast.S"
        cmp bl,15
        ja L_get_length_code

        xor eax,eax
        lodsw
        mov cl,bl
        add bl,16
        shl eax,cl
        or ebp,eax

L_get_length_code:
        mov edx, [esp+0]
        mov ecx, [esp+8]
        and edx,ebp
        mov eax, [ecx+edx*4]

L_dolen:

        mov cl,ah
        sub bl,ah
        shr ebp,cl

        test al,al
        jnz L_test_for_length_base

        shr eax,16
        stosb

L_while_test:

        cmp [esp+16],edi
        jbe L_break_loop

        cmp [esp+20],esi
        ja L_do_loop
        jmp L_break_loop

L_test_for_length_base:
; 502 "inffast.S"
        mov edx,eax
        shr edx,16
        mov cl,al

        test al,16
        jz L_test_for_second_level_length
        and cl,15
        jz L_save_len
        cmp bl,cl
        jae L_add_bits_to_len

        mov ch,cl
        xor eax,eax
        lodsw
        mov cl,bl
        add bl,16
        shl eax,cl
        or ebp,eax
        mov cl,ch

L_add_bits_to_len:
        mov eax,1
        shl eax,cl
        dec eax
        sub bl,cl
        and eax,ebp
        shr ebp,cl
        add edx,eax

L_save_len:
        mov [esp+24],edx

L_decode_distance:
; 549 "inffast.S"
        cmp bl,15
        ja L_get_distance_code

        xor eax,eax
        lodsw
        mov cl,bl
        add bl,16
        shl eax,cl
        or ebp,eax

L_get_distance_code:
        mov edx, [esp+4]
        mov ecx, [esp+12]
        and edx,ebp
        mov eax, [ecx+edx*4]

L_dodist:
        mov edx,eax
        shr edx,16
        mov cl,ah
        sub bl,ah
        shr ebp,cl
; 584 "inffast.S"
        mov cl,al

        test al,16
        jz L_test_for_second_level_dist
        and cl,15
        jz L_check_dist_one
        cmp bl,cl
        jae L_add_bits_to_dist

        mov ch,cl
        xor eax,eax
        lodsw
        mov cl,bl
        add bl,16
        shl eax,cl
        or ebp,eax
        mov cl,ch

L_add_bits_to_dist:
        mov eax,1
        shl eax,cl
        dec eax
        sub bl,cl
        and eax,ebp
        shr ebp,cl
        add edx,eax
        jmp L_check_window

L_check_window:
; 625 "inffast.S"
        mov [esp+44],esi
        mov eax,edi
        sub eax, [esp+40]

        cmp eax,edx
        jb L_clip_window

        mov ecx, [esp+24]
        mov esi,edi
        sub esi,edx

        sub ecx,3
        mov al, [esi]
        mov [edi],al
        mov al, [esi+1]
        mov dl, [esi+2]
        add esi,3
        mov [edi+1],al
        mov [edi+2],dl
        add edi,3
        rep movsb

        mov esi, [esp+44]
        jmp L_while_test

ALIGN 4
L_check_dist_one:
        cmp edx,1
        jne L_check_window
        cmp [esp+40],edi
        je L_check_window

        dec edi
        mov ecx, [esp+24]
        mov al, [edi]
        sub ecx,3

        mov [edi+1],al
        mov [edi+2],al
        mov [edi+3],al
        add edi,4
        rep stosb

        jmp L_while_test

ALIGN 4
L_test_for_second_level_length:

        test al,64
        jnz L_test_for_end_of_block

        mov eax,1
        shl eax,cl
        dec eax
        and eax,ebp
        add eax,edx
        mov edx, [esp+8]
        mov eax, [edx+eax*4]
        jmp L_dolen

ALIGN 4
L_test_for_second_level_dist:

        test al,64
        jnz L_invalid_distance_code

        mov eax,1
        shl eax,cl
        dec eax
        and eax,ebp
        add eax,edx
        mov edx, [esp+12]
        mov eax, [edx+eax*4]
        jmp L_dodist

ALIGN 4
L_clip_window:
; 721 "inffast.S"
        mov ecx,eax
        mov eax, [esp+52]
        neg ecx
        mov esi, [esp+56]

        cmp eax,edx
        jb L_invalid_distance_too_far

        add ecx,edx
        cmp dword ptr [esp+48],0
        jne L_wrap_around_window

        sub eax,ecx
        add esi,eax
; 749 "inffast.S"
        mov eax, [esp+24]
        cmp eax,ecx
        jbe L_do_copy1

        sub eax,ecx
        rep movsb
        mov esi,edi
        sub esi,edx
        jmp L_do_copy1

        cmp eax,ecx
        jbe L_do_copy1

        sub eax,ecx
        rep movsb
        mov esi,edi
        sub esi,edx
        jmp L_do_copy1

L_wrap_around_window:
; 793 "inffast.S"
        mov eax, [esp+48]
        cmp ecx,eax
        jbe L_contiguous_in_window

        add esi, [esp+52]
        add esi,eax
        sub esi,ecx
        sub ecx,eax

        mov eax, [esp+24]
        cmp eax,ecx
        jbe L_do_copy1

        sub eax,ecx
        rep movsb
        mov esi, [esp+56]
        mov ecx, [esp+48]
        cmp eax,ecx
        jbe L_do_copy1

        sub eax,ecx
        rep movsb
        mov esi,edi
        sub esi,edx
        jmp L_do_copy1

L_contiguous_in_window:
; 836 "inffast.S"
        add esi,eax
        sub esi,ecx

        mov eax, [esp+24]
        cmp eax,ecx
        jbe L_do_copy1

        sub eax,ecx
        rep movsb
        mov esi,edi
        sub esi,edx

L_do_copy1:
; 862 "inffast.S"
        mov ecx,eax
        rep movsb

        mov esi, [esp+44]
        jmp L_while_test
; 878 "inffast.S"
ALIGN 4
L_init_mmx:
        emms

        movd mm0,ebp
        mov ebp,ebx
; 896 "inffast.S"
        movd mm4,dword ptr [esp+0]
        movq mm3,mm4
        movd mm5,dword ptr [esp+4]
        movq mm2,mm5
        pxor mm1,mm1
        mov ebx, [esp+8]
        jmp L_do_loop_mmx

ALIGN 4
L_do_loop_mmx:
        psrlq mm0,mm1

        cmp ebp,32
        ja L_get_length_code_mmx

        movd mm6,ebp
        movd mm7,dword ptr[esi]
        add esi,4
        psllq mm7,mm6
        add ebp,32
        por mm0,mm7

L_get_length_code_mmx:
        pand mm4,mm0
        movd eax,mm4
        movq mm4,mm3
        mov eax, [ebx+eax*4]

L_dolen_mmx:
        movzx ecx,ah
        movd mm1,ecx
        sub ebp,ecx

        test al,al
        jnz L_test_for_length_base_mmx

        shr eax,16
        stosb

L_while_test_mmx:

        cmp [esp+16],edi
        jbe L_break_loop

        cmp [esp+20],esi
        ja L_do_loop_mmx
        jmp L_break_loop

L_test_for_length_base_mmx:

        mov edx,eax
        shr edx,16

        test al,16
        jz L_test_for_second_level_length_mmx
        and eax,15
        jz L_decode_distance_mmx

        psrlq mm0,mm1
        movd mm1,eax
        movd ecx,mm0
        sub ebp,eax
        and ecx, [inflate_fast_mask+eax*4]
        add edx,ecx

L_decode_distance_mmx:
        psrlq mm0,mm1

        cmp ebp,32
        ja L_get_dist_code_mmx

        movd mm6,ebp
        movd mm7,dword ptr [esi]
        add esi,4
        psllq mm7,mm6
        add ebp,32
        por mm0,mm7

L_get_dist_code_mmx:
        mov ebx, [esp+12]
        pand mm5,mm0
        movd eax,mm5
        movq mm5,mm2
        mov eax, [ebx+eax*4]

L_dodist_mmx:

        movzx ecx,ah
        mov ebx,eax
        shr ebx,16
        sub ebp,ecx
        movd mm1,ecx

        test al,16
        jz L_test_for_second_level_dist_mmx
        and eax,15
        jz L_check_dist_one_mmx

L_add_bits_to_dist_mmx:
        psrlq mm0,mm1
        movd mm1,eax
        movd ecx,mm0
        sub ebp,eax
        and ecx, [inflate_fast_mask+eax*4]
        add ebx,ecx

L_check_window_mmx:
        mov [esp+44],esi
        mov eax,edi
        sub eax, [esp+40]

        cmp eax,ebx
        jb L_clip_window_mmx

        mov ecx,edx
        mov esi,edi
        sub esi,ebx

        sub ecx,3
        mov al, [esi]
        mov [edi],al
        mov al, [esi+1]
        mov dl, [esi+2]
        add esi,3
        mov [edi+1],al
        mov [edi+2],dl
        add edi,3
        rep movsb

        mov esi, [esp+44]
        mov ebx, [esp+8]
        jmp L_while_test_mmx

ALIGN 4
L_check_dist_one_mmx:
        cmp ebx,1
        jne L_check_window_mmx
        cmp [esp+40],edi
        je L_check_window_mmx

        dec edi
        mov ecx,edx
        mov al, [edi]
        sub ecx,3

        mov [edi+1],al
        mov [edi+2],al
        mov [edi+3],al
        add edi,4
        rep stosb

        mov ebx, [esp+8]
        jmp L_while_test_mmx

ALIGN 4
L_test_for_second_level_length_mmx:
        test al,64
        jnz L_test_for_end_of_block

        and eax,15
        psrlq mm0,mm1
        movd ecx,mm0
        and ecx, [inflate_fast_mask+eax*4]
        add ecx,edx
        mov eax, [ebx+ecx*4]
        jmp L_dolen_mmx

ALIGN 4
L_test_for_second_level_dist_mmx:
        test al,64
        jnz L_invalid_distance_code

        and eax,15
        psrlq mm0,mm1
        movd ecx,mm0
        and ecx, [inflate_fast_mask+eax*4]
        mov eax, [esp+12]
        add ecx,ebx
        mov eax, [eax+ecx*4]
        jmp L_dodist_mmx

ALIGN 4
L_clip_window_mmx:

        mov ecx,eax
        mov eax, [esp+52]
        neg ecx
        mov esi, [esp+56]

        cmp eax,ebx
        jb L_invalid_distance_too_far

        add ecx,ebx
        cmp dword ptr [esp+48],0
        jne L_wrap_around_window_mmx

        sub eax,ecx
        add esi,eax

        cmp edx,ecx
        jbe L_do_copy1_mmx

        sub edx,ecx
        rep movsb
        mov esi,edi
        sub esi,ebx
        jmp L_do_copy1_mmx

        cmp edx,ecx
        jbe L_do_copy1_mmx

        sub edx,ecx
        rep movsb
        mov esi,edi
        sub esi,ebx
        jmp L_do_copy1_mmx

L_wrap_around_window_mmx:

        mov eax, [esp+48]
        cmp ecx,eax
        jbe L_contiguous_in_window_mmx

        add esi, [esp+52]
        add esi,eax
        sub esi,ecx
        sub ecx,eax

        cmp edx,ecx
        jbe L_do_copy1_mmx

        sub edx,ecx
        rep movsb
        mov esi, [esp+56]
        mov ecx, [esp+48]
        cmp edx,ecx
        jbe L_do_copy1_mmx

        sub edx,ecx
        rep movsb
        mov esi,edi
        sub esi,ebx
        jmp L_do_copy1_mmx

L_contiguous_in_window_mmx:

        add esi,eax
        sub esi,ecx

        cmp edx,ecx
        jbe L_do_copy1_mmx

        sub edx,ecx
        rep movsb
        mov esi,edi
        sub esi,ebx

L_do_copy1_mmx:

        mov ecx,edx
        rep movsb

        mov esi, [esp+44]
        mov ebx, [esp+8]
        jmp L_while_test_mmx
; 1174 "inffast.S"
L_invalid_distance_code:

        mov ecx, invalid_distance_code_msg
        mov edx,INFLATE_MODE_BAD
        jmp L_update_stream_state

L_test_for_end_of_block:

        test al,32
        jz L_invalid_literal_length_code

        mov ecx,0
        mov edx,INFLATE_MODE_TYPE
        jmp L_update_stream_state

L_invalid_literal_length_code:

        mov ecx, invalid_literal_length_code_msg
        mov edx,INFLATE_MODE_BAD
        jmp L_update_stream_state

L_invalid_distance_too_far:

        mov esi, [esp+44]
        mov ecx, invalid_distance_too_far_msg
        mov edx,INFLATE_MODE_BAD
        jmp L_update_stream_state

L_update_stream_state:

        mov eax, [esp+88]
        test ecx,ecx
        jz L_skip_msg
        mov [eax+24],ecx
L_skip_msg:
        mov eax, [eax+28]
        mov [eax+mode_state],edx
        jmp L_break_loop

ALIGN 4
L_break_loop:
; 1243 "inffast.S"
        cmp dword ptr [inflate_fast_use_mmx],2
        jne L_update_next_in

        mov ebx,ebp

L_update_next_in:
; 1266 "inffast.S"
        mov eax, [esp+88]
        mov ecx,ebx
        mov edx, [eax+28]
        shr ecx,3
        sub esi,ecx
        shl ecx,3
        sub ebx,ecx
        mov [eax+12],edi
        mov [edx+bits_state],ebx
        mov ecx,ebx

        lea ebx, [esp+28]
        cmp [esp+20],ebx
        jne L_buf_not_used

        sub esi,ebx
        mov ebx, [eax+0]
        mov [esp+20],ebx
        add esi,ebx
        mov ebx, [eax+4]
        sub ebx,11
        add [esp+20],ebx

L_buf_not_used:
        mov [eax+0],esi

        mov ebx,1
        shl ebx,cl
        dec ebx

        cmp dword ptr [inflate_fast_use_mmx],2
        jne L_update_hold

        psrlq mm0,mm1
        movd ebp,mm0

        emms

L_update_hold:

        and ebp,ebx
        mov [edx+hold_state],ebp

        mov ebx, [esp+20]
        cmp ebx,esi
        jbe L_last_is_smaller

        sub ebx,esi
        add ebx,11
        mov [eax+4],ebx
        jmp L_fixup_out
L_last_is_smaller:
        sub esi,ebx
        neg esi
        add esi,11
        mov [eax+4],esi

L_fixup_out:

        mov ebx, [esp+16]
        cmp ebx,edi
        jbe L_end_is_smaller

        sub ebx,edi
        add ebx,257
        mov [eax+16],ebx
        jmp L_done
L_end_is_smaller:
        sub edi,ebx
        neg edi
        add edi,257
        mov [eax+16],edi

L_done:
        add esp,64
        popfd
        pop ebx
        pop ebp
        pop esi
        pop edi
        ret

_TEXT ends
end

# -*- Makefile -*-
!IF "$(OS)" == "Windows_NT"
NULL=
rmdir=rd /s /q
!ELSE
NULL=nul
rmdir=deltree /y
!ENDIF

SILENT=@

# Default build and bind modes
BUILD_MODE = release
BIND_MODE = shared

!IF "$(BUILD_MODE)" == "release" || "$(BUILD_MODE)" == "Release"
!IF "$(BIND_MODE)" == "shared"
# release shared
APR_LIB_PFX = $(APR_SOURCE)\Release\lib
API_LIB_PFX = $(API_SOURCE)\Release\lib
CFG_CFLAGS = /MD /Zi /O2
CFG_DEFINES = /D "NDEBUG"
CFG_LDFLAGS = /debug /opt:ref
CFG_OUTPUT = Release\iconv

!ELSE
!IF "$(BIND_MODE)" == "static"
# release static
APR_LIB_PFX = $(APR_SOURCE)\LibR\ # no line continuation
API_LIB_PFX = $(API_SOURCE)\LibR\ # no line continuation
CFG_CFLAGS = /MD /Zi /O2
CFG_DEFINES = /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
CFG_LDFLAGS = /debug /opt:ref
CFG_OUTPUT = LibR\iconv

!ELSE
!ERROR Unknown bind mode "$(BIND_MODE)"
!ENDIF
!ENDIF

!ELSE
!IF "$(BUILD_MODE)" == "debug" || "$(BUILD_MODE)" == "Debug"
!IF "$(BIND_MODE)" == "shared"
# debug shared
APR_LIB_PFX = $(APR_SOURCE)\Debug\lib
API_LIB_PFX = $(API_SOURCE)\Debug\lib
CFG_CFLAGS = /MDd /Zi /Od
CFG_DEFINES = /D "_DEBUG"
CFG_LDFLAGS = /debug
CFG_OUTPUT = Debug\iconv
_VC_MANIFEST_INC=0
_VC_MANIFEST_BASENAME=__VC80

!ELSE
!IF "$(BIND_MODE)" == "static"
# debug static
APR_LIB_PFX = $(APR_SOURCE)\LibD\ # no line continuation
API_LIB_PFX = $(API_SOURCE)\LibD\ # no line continuation
CFG_CFLAGS = /MDd /Zi /Od
CFG_DEFINES = /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
CFG_LDFLAGS = /debug
CFG_OUTPUT = LibD\iconv
_VC_MANIFEST_INC=1
_VC_MANIFEST_BASENAME=__VC80.Debug

!ELSE
!ERROR Unknown bind mode "$(BIND_MODE)"
!ENDIF
!ENDIF

!ELSE
!ERROR Unknown build mode "$(BUILD_MODE)"
!ENDIF
!ENDIF

!if "$(_VC_MANIFEST_INC)" == "1"
_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
!else
_VC_MANIFEST_AUTO_RES=
!endif

!if "$(_VC_MANIFEST_INC)" == "1"
MT_SPECIAL_RETURN=1090650113
MT_SPECIAL_SWITCH=-notify_update
_VC_MANIFEST_EMBED_DLL= \
  $(SILENT)if exist $@.manifest mt.exe -nologo -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
  if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
    rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
    link $** /out:$@ $(LFLAGS)
!else
_VC_MANIFEST_EMBED_DLL= \
  $(SILENT)if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
!endif

APR_SOURCE = ..\..\apr
API_SOURCE = ..
OUTPUT_DIR = $(API_SOURCE)\$(CFG_OUTPUT)
OBJ_DIR = $(OUTPUT_DIR)\objs

INT_CFLAGS = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch"
INT_INCLUDES = /I "$(API_SOURCE)\include" /I "$(API_SOURCE)\lib" \
                /I "$(APR_SOURCE)\include"
INT_DEFINES = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $(CFG_DEFINES)
INT_LDFLAGS = /nologo /dll /incremental:no /subsystem:windows \
                /export:iconv_module,DATA $(CFG_LDFLAGS)

CFLAGS = /W3
ALL_CFLAGS = $(INT_CFLAGS) $(INT_INCLUDES) $(INT_DEFINES) $(CFLAGS)

LDFLAGS =
ALL_LDFLAGS = $(INT_LDFLAGS) $(LDFLAGS)

.c{$(OUTPUT_DIR)}.so:
        -$(SILENT)if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
        -$(SILENT)if not exist "$(OBJ_DIR)\$(NULL)" mkdir "$(OBJ_DIR)"
        $(SILENT)echo Compiling $<... via $(OBJ_DIR)\$(@B).obj to $@
        $(SILENT)cl $(ALL_CFLAGS) /Fo"$(OBJ_DIR)\$(@B).obj" $(_VC_MANIFEST_AUTO_RES)\
                /Fd"$(OBJ_DIR)\$(@B)_src" $< \
                /link $(ALL_LDFLAGS) /out:$@ \
                /base:@"..\build\BaseAddr.ref",$(@F) \
                "$(API_LIB_PFX)apriconv.lib" "$(APR_LIB_PFX)apr.lib" \
                kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
                $(_VC_MANIFEST_EMBED_DLL)
        $(SILENT)echo.
        $(SILENT)del "$*.exp"
        $(SILENT)del "$*.lib"

all: $(ALL_TARGETS)

# The rebase target below is used only to *regenerate* the BaseAddr.ref file
# if the module list or sizes change considerably. Use the rebase target to

# to create the BaseAddr.0xNNNNNNNN.txt file of the rebase results,
# then remerge it back into the explicit build/BaseAddr.ref file.
#
BASE_REF = $(OUTPUT_DIR)\BaseAddr.$(REBASE_TOP).txt
ALL_REBASE = -d -p -b $(REBASE_TOP) -C $(BASE_REF)

rebase: $(ALL_TARGETS)
        $(SILENT)echo Extracting .dbg symbols and rebasing all modules...
        $(SILENT)rebase $(ALL_REBASE) $(ALL_TARGETS)
        $(SILENT)echo.

clean:
        -$(SILENT)if exist "$(OUTPUT_DIR)/$(NULL)" $(rmdir) $(OUTPUT_DIR)

install:
        @echo Copying apr-iconv modules from $(OUTPUT_DIR) to $(INSTALL_DIR)
        -$(SILENT)mkdir "$(INSTALL_DIR)"
        $(SILENT)copy $(OUTPUT_DIR)\*.so "$(INSTALL_DIR)" < <<
A
<<
        @echo Copying apr-iconv pdb debugging symbols from $(OUTPUT_DIR) to $(INSTALL_DIR)
        $(SILENT)copy $(OUTPUT_DIR)\*.pdb "$(INSTALL_DIR)" < <<
A
<<

#**** neon Win32 -*- Makefile -*- ********************************************
#
# Define DEBUG_BUILD to create a debug version of the library.

!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF

########
# Debug vs. Release build
!IF "$(DEBUG_BUILD)" == ""
INTDIR = Release
CFLAGS = /MD /W3 /GX /O2 /D "NDEBUG"
TARGET = .\libneon.lib
!ELSE
INTDIR = Debug
CFLAGS = /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG"
TARGET = .\libneonD.lib
!ENDIF

########
# Whether to build SSPI
!IF "$(SSPI_BUILD)" != ""
CFLAGS = $(CFLAGS) /D HAVE_SSPI
!ENDIF

########
# Support for Expat integration
#
# If EXPAT_SRC or EXPAT_INC are set, then assume compiling against a
# pre-built binary Expat 1.95.X. You can use either EXPAT_SRC
# to specify the top-level Expat directory, or EXPAT_INC to directly
# specify the Expat include directory. (If both are set, EXPAT_SRC
# is ignored).
#
# If EXPAT_SRC and EXPAT_INC are not set, then the user can
# still set EXPAT_FLAGS to specify very specific compile behavior.
#
# If none of EXPAT_SRC, EXPAT_INC and EXPAT_FLAGS are set, disable
# WebDAV support.

!IF "$(EXPAT_INC)" == ""
!IF "$(EXPAT_SRC)" != ""
EXPAT_INC = $(EXPAT_SRC)\Source\Lib
!ENDIF
!ENDIF

BUILD_EXPAT = 1
!IF "$(EXPAT_INC)" == ""
!IFNDEF EXPAT_FLAGS
EXPAT_FLAGS =
BUILD_EXPAT =
!ENDIF
!ELSE
EXPAT_FLAGS = /I "$(EXPAT_INC)" /D HAVE_EXPAT /D HAVE_EXPAT_H /D NE_HAVE_DAV
!ENDIF

########
# Support for OpenSSL integration
!IF "$(OPENSSL_SRC)" == ""
OPENSSL_FLAGS =
!ELSE
OPENSSL_FLAGS = /I "$(OPENSSL_SRC)\inc32" /D NE_HAVE_SSL /D HAVE_OPENSSL
!ENDIF

########
# Support for zlib integration
!IF "$(ZLIB_SRC)" == ""
ZLIB_FLAGS =
ZLIB_LIBS =
ZLIB_CLEAN =
!ELSE
ZLIB_CLEAN = ZLIB_CLEAN
!IF "$(DEBUG_BUILD)" == ""
ZLIB_STATICLIB = zlib.lib
ZLIB_SHAREDLIB = zlib1.dll
ZLIB_IMPLIB = zdll.lib
ZLIB_LDFLAGS = /nologo /release
!ELSE
ZLIB_STATICLIB = zlib_d.lib
ZLIB_SHAREDLIB = zlib1_d.dll
ZLIB_IMPLIB = zdll_d.lib
ZLIB_LDFLAGS = /nologo /debug
!ENDIF
ZLIB_FLAGS = /I "$(ZLIB_SRC)" /D NE_HAVE_ZLIB
!IF "$(ZLIB_DLL)" == ""
ZLIB_LIBS = "$(ZLIB_SRC)\$(ZLIB_STATICLIB)"
!ELSE
ZLIB_FLAGS = $(ZLIB_FLAGS) /D ZLIB_DLL
ZLIB_LIBS = "$(ZLIB_SRC)\$(ZLIB_IMPLIB)"
!ENDIF
!ENDIF

########
# Support for IPv6
!IF "$(ENABLE_IPV6)" == "yes"
IPV6_FLAGS = /D USE_GETADDRINFO
!ENDIF

# Exclude stuff we don't need from the Win32 headers
WIN32_DEFS = /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT

CPP=cl.exe
CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(EXPAT_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) $(IPV6_FLAGS) /D "HAVE_CONFIG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(TARGET)"

LIB32_OBJS= \
        "$(INTDIR)\ne_alloc.obj" \
        "$(INTDIR)\ne_auth.obj" \
        "$(INTDIR)\ne_basic.obj" \
        "$(INTDIR)\ne_compress.obj" \
        "$(INTDIR)\ne_dates.obj" \
        "$(INTDIR)\ne_i18n.obj" \
        "$(INTDIR)\ne_md5.obj" \
        "$(INTDIR)\ne_redirect.obj" \
        "$(INTDIR)\ne_request.obj" \
        "$(INTDIR)\ne_session.obj" \
        "$(INTDIR)\ne_socket.obj" \
        "$(INTDIR)\ne_sspi.obj" \
        "$(INTDIR)\ne_string.obj" \
        "$(INTDIR)\ne_uri.obj" \
        "$(INTDIR)\ne_utils.obj"

!IF "$(BUILD_EXPAT)" != ""
LIB32_OBJS= \
        $(LIB32_OBJS) \
        "$(INTDIR)\ne_207.obj" \
        "$(INTDIR)\ne_xml.obj" \
        "$(INTDIR)\ne_xmlreq.obj" \
        "$(INTDIR)\ne_acl.obj" \
        "$(INTDIR)\ne_props.obj" \
        "$(INTDIR)\ne_locks.obj"
!ENDIF

!IF "$(OPENSSL_SRC)" != ""
LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\ne_openssl.obj"
!IFDEF OPENSSL_STATIC
LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \
                           "$(OPENSSL_SRC)\out32\ssleay32.lib"
!ELSE
LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \
                           "$(OPENSSL_SRC)\out32dll\ssleay32.lib"
!ENDIF
!ELSE
# Provide ABI-compatibility stubs for SSL interface
LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\ne_stubssl.obj"
!ENDIF
!IF "$(ZLIB_SRC)" != ""
LIB32_OBJS = $(LIB32_OBJS) $(ZLIB_LIBS)
!ENDIF

ALL: ".\src\config.h" "$(TARGET)"

CLEAN: $(ZLIB_CLEAN)
        -@erase "$(INTDIR)\ne_207.obj"
        -@erase "$(INTDIR)\ne_alloc.obj"
        -@erase "$(INTDIR)\ne_acl.obj"
        -@erase "$(INTDIR)\ne_auth.obj"
        -@erase "$(INTDIR)\ne_basic.obj"
        -@erase "$(INTDIR)\ne_compress.obj"
        -@erase "$(INTDIR)\ne_dates.obj"
        -@erase "$(INTDIR)\ne_i18n.obj"
        -@erase "$(INTDIR)\ne_locks.obj"
        -@erase "$(INTDIR)\ne_md5.obj"
        -@erase "$(INTDIR)\ne_props.obj"
        -@erase "$(INTDIR)\ne_redirect.obj"
        -@erase "$(INTDIR)\ne_request.obj"
        -@erase "$(INTDIR)\ne_session.obj"
        -@erase "$(INTDIR)\ne_openssl.obj"
        -@erase "$(INTDIR)\ne_stubssl.obj"
        -@erase "$(INTDIR)\ne_socket.obj"
        -@erase "$(INTDIR)\ne_sspi.obj"
        -@erase "$(INTDIR)\ne_string.obj"
        -@erase "$(INTDIR)\ne_uri.obj"
        -@erase "$(INTDIR)\ne_utils.obj"
        -@erase "$(INTDIR)\ne_xml.obj"
        -@erase "$(INTDIR)\ne_xmlreq.obj"
        -@erase "$(TARGET)"
        -@erase ".\src\config.h"

"$(TARGET)": $(DEF_FILE) $(LIB32_OBJS)
        -@if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
        $(LIB32) @<<
  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<

{src}.c{$(INTDIR)}.obj::
        -@if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
        $(CPP) @<<
  $(CPP_PROJ) $<
<<

".\src\config.h": config.hw
        -@if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
        <<tempfile.bat
  @echo off
  copy .\config.hw .\src\config.h > nul
  echo Created config.h from config.hw
<<

"$(INTDIR)\ne_207.obj": .\src\ne_207.c
"$(INTDIR)\ne_alloc.obj": .\src\ne_alloc.c
"$(INTDIR)\ne_acl.obj": .\src\ne_acl.c
"$(INTDIR)\ne_auth.obj": .\src\ne_auth.c
"$(INTDIR)\ne_basic.obj": .\src\ne_basic.c
"$(INTDIR)\ne_compress.obj": .\src\ne_compress.c
"$(INTDIR)\ne_dates.obj": .\src\ne_dates.c
"$(INTDIR)\ne_i18n.obj": .\src\ne_i18n.c
"$(INTDIR)\ne_locks.obj": .\src\ne_locks.c
"$(INTDIR)\ne_md5.obj": .\src\ne_md5.c
"$(INTDIR)\ne_props.obj": .\src\ne_props.c
"$(INTDIR)\ne_redirect.obj": .\src\ne_redirect.c
"$(INTDIR)\ne_request.obj": .\src\ne_request.c
"$(INTDIR)\ne_session.obj": .\src\ne_session.c
"$(INTDIR)\ne_openssl.obj": .\src\ne_openssl.c
"$(INTDIR)\ne_stubssl.obj": .\src\ne_stubssl.c
"$(INTDIR)\ne_socket.obj": .\src\ne_socket.c
"$(INTDIR)\ne_sspi.obj": .\src\ne_sspi.c
"$(INTDIR)\ne_string.obj": .\src\ne_string.c
"$(INTDIR)\ne_uri.obj": .\src\ne_uri.c
"$(INTDIR)\ne_utils.obj": .\src\ne_utils.c
"$(INTDIR)\ne_xml.obj": .\src\ne_xml.c
"$(INTDIR)\ne_xmlreq.obj": .\src\ne_xmlreq.c

"$(ZLIB_SRC)\$(ZLIB_STATICLIB)":
        <<tempfile.bat
  @echo off
  cd /d "$(ZLIB_SRC)"
  $(MAKE) /nologo /f win32\Makefile.msc CFLAGS="/nologo $(CFLAGS)" LDFLAGS="$(ZLIB_LDFLAGS)" STATICLIB=$(ZLIB_STATICLIB) $(ZLIB_STATICLIB)
<<

"$(ZLIB_SRC)\$(ZLIB_IMPLIB)":
        <<tempfile.bat
  @echo off
  cd /d "$(ZLIB_SRC)"
  $(MAKE) /nologo /f win32\Makefile.msc CFLAGS="/nologo $(CFLAGS)" LDFLAGS="$(ZLIB_LDFLAGS)" SHAREDLIB=$(ZLIB_SHAREDLIB) IMPLIB=$(ZLIB_IMPLIB) $(ZLIB_SHAREDLIB) $(ZLIB_IMPLIB)
<<

ZLIB_CLEAN:
        <<tempfile.bat
  @echo off
  cd /d "$(ZLIB_SRC)"
  $(MAKE) /nologo /f win32\Makefile.msc STATICLIB=$(ZLIB_STATICLIB) SHAREDLIB=$(ZLIB_SHAREDLIB) IMPLIB=$(ZLIB_IMPLIB) clean
<<

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 16 20:06:54 2005

This is an archived mail posted to the Subversion Dev mailing list.