From 37a639860cf6b89574027546174361118918e24b Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 31 Jan 2014 10:53:03 -0600
Subject: [PATCH] revert last srtp change and fix for windows different
---
libs/srtp/crypto/include/datatypes.h | 8 ++++++--
w32/Library/FreeSwitchCore.2010.vcxproj | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libs/srtp/crypto/include/datatypes.h b/libs/srtp/crypto/include/datatypes.h
index 6f18e9ebbf..12e9ce99b6 100644
--- a/libs/srtp/crypto/include/datatypes.h
+++ b/libs/srtp/crypto/include/datatypes.h
@@ -409,12 +409,16 @@ static inline uint32_t be32_to_cpu(uint32_t v) {
# define be32_to_cpu(x) ntohl((x))
# endif /* HAVE_X86 */
+static inline uint64_t be64_to_cpu(uint64_t v) {
# ifdef NO_64BIT_MATH
/* use the make64 functions to do 64-bit math */
-# define be64_to_cpu(v) (make64(htonl(low32(v)),htonl(high32(v))))
+ v = make64(htonl(low32(v)),htonl(high32(v)));
# else
-# define be64_to_cpu(v) ((ntohl((uint32_t)(v >> 32))) | (((uint64_t)ntohl((uint32_t)v)) << 32))
+ /* use the native 64-bit math */
+ v= (uint64_t)((be32_to_cpu((uint32_t)(v >> 32))) | (((uint64_t)be32_to_cpu((uint32_t)v)) << 32));
# endif
+ return v;
+}
#endif /* ! SRTP_KERNEL_LINUX */
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 21146b9e6c..84eeabe605 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -103,6 +103,7 @@
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnablePREfast>false</EnablePREfast>
<CompileAs>Default</CompileAs>
+ <DisableSpecificWarnings>6340;6246;6011;6387;4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
@@ -209,6 +210,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
+ <DisableSpecificWarnings>6340;6246;6011;6387;4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>