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

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

This commit is contained in:
Chris Rienzo 2014-01-31 18:10:21 -05:00
parent 5cd9bfcf14 ec70120718
commit 6d5bd4abaa
9 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/esl/src/esl.c
View File

@ -1233,7 +1233,7 @@ static esl_ssize_t handle_recv(esl_handle_t *handle, void *data, esl_size_t data
} else if ((activity & ESL_POLL_READ)) {
if (!(activity = recv(handle->sock, data, datalen, 0))) {
activity = -1;
} else if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
} else if (activity < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) {
activity = 0;
}
}

3
libs/srtp/crypto/cipher/aes_icm.c
View File

@ -49,9 +49,6 @@
#include "aes_icm.h"
#include "alloc.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
debug_module_t mod_aes_icm = {
0, /* debugging is off by default */

3
libs/srtp/crypto/cipher/null_cipher.c
View File

@ -48,9 +48,6 @@
#include "null_cipher.h"
#include "alloc.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
/* the null_cipher uses the cipher debug module */

3
libs/srtp/crypto/hash/null_auth.c
View File

@ -48,9 +48,6 @@
#include "null_auth.h"
#include "alloc.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
/* null_auth uses the auth debug module */

3
libs/srtp/crypto/kernel/err.c
View File

@ -50,9 +50,6 @@
# endif
#endif
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
/* err_level reflects the level of errors that are reported */

4
libs/srtp/crypto/replay/ut_sim.c
View File

@ -47,10 +47,6 @@
#include "ut_sim.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
int
ut_compar(const void *a, const void *b) {
return rand() > (RAND_MAX/2) ? -1 : 1;

4
libs/srtp/libsrtp.2010.vcxproj
View File

@ -136,6 +136,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -156,6 +157,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -170,6 +172,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -187,6 +190,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dll|Win32'">

8
libs/srtp/libsrtp.2012.vcxproj
View File

@ -144,7 +144,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -165,7 +165,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -180,7 +180,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -198,7 +198,7 @@
<StructMemberAlignment>Default</StructMemberAlignment>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4305;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dll|Win32'">

3
libs/srtp/srtp/ekt.c
View File

@ -47,9 +47,6 @@
#include "srtp_priv.h"
#include "ekt.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
extern debug_module_t mod_srtp;