diff options
Diffstat (limited to 'Utilities/cmcurl')
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Utilities/cmcurl/getdate.c | 4 | ||||
| -rw-r--r-- | Utilities/cmcurl/inet_pton.c | 4 | ||||
| -rw-r--r-- | Utilities/cmcurl/md5.c | 2 | ||||
| -rw-r--r-- | Utilities/cmcurl/mprintf.c | 4 |
5 files changed, 16 insertions, 8 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index b615242..6cec671 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -255,10 +255,18 @@ CHECK_INCLUDE_FILE_CONCAT("sys/utsname.h" HAVE_SYS_UTSNAME_H) CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T) CHECK_TYPE_SIZE(ssize_t SIZEOF_SSIZE_T) CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG) +CHECK_TYPE_SIZE("long" SIZEOF_LONG) +CHECK_TYPE_SIZE("__int64" SIZEOF___INT64) CHECK_TYPE_SIZE("long double" SIZEOF_LONG_DOUBLE) IF(NOT HAVE_SIZEOF_SSIZE_T) - SET(ssize_t int) + IF(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) + SET(ssize_t long) + ENDIF(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) + IF(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T) + SET(ssize_t __int64) + ENDIF(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T) ENDIF(NOT HAVE_SIZEOF_SSIZE_T) + IF(HAVE_SIZEOF_LONG_LONG) SET(HAVE_LONGLONG 1) ENDIF(HAVE_SIZEOF_LONG_LONG) diff --git a/Utilities/cmcurl/getdate.c b/Utilities/cmcurl/getdate.c index 6aca48e..2b97cf8 100644 --- a/Utilities/cmcurl/getdate.c +++ b/Utilities/cmcurl/getdate.c @@ -1105,7 +1105,7 @@ int yynerrs; if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T)(yyssp - yyss + 1); #ifdef yyoverflow { @@ -1281,7 +1281,7 @@ yyreduce: break; case 5: -#line 251 "getdate.y" + //#line 251 "getdate.y" { context->yyHaveZone++; } diff --git a/Utilities/cmcurl/inet_pton.c b/Utilities/cmcurl/inet_pton.c index 5e8e9b3..ed74c26 100644 --- a/Utilities/cmcurl/inet_pton.c +++ b/Utilities/cmcurl/inet_pton.c @@ -113,11 +113,11 @@ inet_pton4(const char *src, unsigned char *dst) const char *pch; if ((pch = strchr(digits, ch)) != NULL) { - u_int new = *tp * 10 + (pch - digits); + size_t new = *tp * 10 + (pch - digits); if (new > 255) return (0); - *tp = new; + *tp = (unsigned char)new; if (! saw_digit) { if (++octets > 4) return (0); diff --git a/Utilities/cmcurl/md5.c b/Utilities/cmcurl/md5.c index 269726b..a70b344 100644 --- a/Utilities/cmcurl/md5.c +++ b/Utilities/cmcurl/md5.c @@ -343,6 +343,6 @@ void Curl_md5it(unsigned char *outbuffer, /* 16 bytes */ { MD5_CTX ctx; MD5_Init(&ctx); - MD5_Update(&ctx, input, strlen((char *)input)); + MD5_Update(&ctx, input, (unsigned int)strlen((char *)input)); MD5_Final(outbuffer, &ctx); } diff --git a/Utilities/cmcurl/mprintf.c b/Utilities/cmcurl/mprintf.c index 569207a..12d1208 100644 --- a/Utilities/cmcurl/mprintf.c +++ b/Utilities/cmcurl/mprintf.c @@ -619,10 +619,10 @@ static int dprintf_formatf( char alt; /* Width of a field. */ - long width; + ssize_t width; /* Precision of a field. */ - long prec; + ssize_t prec; /* Decimal integer is negative. */ char is_neg; |