fix x64 windows warnings, make sure word is 64bit

This commit is contained in:
toddouska 2012-11-01 12:21:47 -07:00
parent dc83cc6a0e
commit 0e2c236e77
3 changed files with 3 additions and 3 deletions

View File

@ -82,7 +82,7 @@
/* These platforms have 64-bit CPU registers. */
#if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
defined(__mips64) || defined(__x86_64__))
defined(__mips64) || defined(__x86_64__) || defined(_M_X64))
typedef word64 word;
#else
typedef word32 word;

View File

@ -167,7 +167,7 @@ static int decode_url(const char* url, int urlSz,
int CyaSSL_OCSP_set_override_url(CYASSL_OCSP* ocsp, const char* url)
{
if (ocsp != NULL) {
int urlSz = strlen(url);
int urlSz = (int)XSTRLEN(url);
decode_url(url, urlSz,
ocsp->overrideName, ocsp->overridePath, &ocsp->overridePort);
return 1;

View File

@ -6649,7 +6649,7 @@ static int initGlobalRNG = 0;
return 0;
}
if (Base16_Decode((byte*)str, (int)strlen(str), decoded, &decSz) < 0) {
if (Base16_Decode((byte*)str, (int)XSTRLEN(str), decoded, &decSz) < 0) {
CYASSL_MSG("Bad Base16_Decode error");
return 0;
}