kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert last srtp change and fix for windows different

This commit is contained in:
Jeff Lenk 2014-01-31 10:53:03 -06:00
parent 360ef648b4
commit 37a639860c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/srtp/crypto/include/datatypes.h
View File

@ -409,12 +409,16 @@ static inline uint32_t be32_to_cpu(uint32_t v) {
# define be32_to_cpu(x) ntohl((x)) # define be32_to_cpu(x) ntohl((x))
# endif /* HAVE_X86 */ # endif /* HAVE_X86 */
static inline uint64_t be64_to_cpu(uint64_t v) {
# ifdef NO_64BIT_MATH # ifdef NO_64BIT_MATH
/* use the make64 functions to do 64-bit 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 # 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 # endif
return v;
}
#endif /* ! SRTP_KERNEL_LINUX */ #endif /* ! SRTP_KERNEL_LINUX */

2
w32/Library/FreeSwitchCore.2010.vcxproj
View File

@ -103,6 +103,7 @@
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>6340;6246;6011;6387;4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<ProjectReference> <ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies> <LinkLibraryDependencies>true</LinkLibraryDependencies>
@ -209,6 +210,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
<DisableSpecificWarnings>6340;6246;6011;6387;4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<ProjectReference> <ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies> <LinkLibraryDependencies>true</LinkLibraryDependencies>