FS-7966: fix more msvc 2015 build warnings.

This commit is contained in:
Mike Jerris
2015-09-02 13:06:29 -04:00
parent 08f634b215
commit 46c0d05216
20 changed files with 68 additions and 47 deletions

View File

@@ -27,6 +27,11 @@
#ifndef _RTMP_VIDEO_H
#define _RTMP_VIDEO_H
#include <assert.h>
#include <string.h>
#ifdef WIN32
#include <windows.h>
#endif
#include <openssl/hmac.h>
#include <openssl/sha.h>
@@ -149,7 +154,7 @@ static void HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t
unsigned int digestLen;
HMAC_CTX ctx;
HMAC_setup(ctx, key, keylen);
HMAC_setup(ctx, key, (int)keylen);
HMAC_crunch(ctx, message, messageLen);
HMAC_finish(ctx, digest, digestLen);
@@ -603,7 +608,7 @@ static int ReadN(void * user_data, void * out_buffer, size_t size)
memcpy(out_buffer, helper->r_buf + helper->r_pos, len);
helper->r_pos += len;
return len;
return (int)len;
}
static int WriteN(void * user_data, void * buffer, size_t size)
@@ -615,7 +620,7 @@ static int WriteN(void * user_data, void * buffer, size_t size)
memcpy(helper->w_buf + helper->w_pos, buffer, len);
helper->w_pos += len;
return len;
return (int)len;
}
static int SHandShake0(handshake_helper_t * r)

View File

@@ -96,7 +96,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>
@@ -114,7 +114,7 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>
@@ -132,7 +132,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>
@@ -149,7 +149,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>