From aae1ae50059aba3d0f96d69a8502c97a664bb19f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 29 Jul 2014 08:57:17 -0700
Subject: [PATCH] MSVC: Define NATIVE_LITTLE_ENDIAN / inline as __inline /
 UNICODE & _UNICODE

---
 builds/msvc/properties/Common.props | 4 +++-
 configure.ac                        | 3 +--
 msvc-scripts/sodium.props           | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
index 72588d6e..6e10d886 100644
--- a/builds/msvc/properties/Common.props
+++ b/builds/msvc/properties/Common.props
@@ -14,8 +14,10 @@
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/configure.ac b/configure.ac
index fb380926..a612af18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,8 +409,7 @@ dnl Checks for functions and headers
 AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AC_CHECK_FUNCS([arc4random arc4random_buf])
 ])
-AC_CHECK_FUNCS([mlock VirtualLock])
-AC_CHECK_FUNCS([SecureZeroMemory explicit_bzero posix_memalign])
+AC_CHECK_FUNCS([mlock explicit_bzero posix_memalign])
 
 AC_SUBST([LIBTOOL_EXTRA_FLAGS])
 
diff --git a/msvc-scripts/sodium.props b/msvc-scripts/sodium.props
index d68425a1..613cbd0a 100644
--- a/msvc-scripts/sodium.props
+++ b/msvc-scripts/sodium.props
@@ -6,7 +6,10 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PreBuildEvent>
       <Command>$(SolutionDir)/msvc-scripts/process.bat</Command>