Only in curl_new/lib: ca-bundle.h diff -ur curl/lib/connect.c curl_new/lib/connect.c --- curl/lib/connect.c 2005-03-14 07:43:23.000000000 -0800 +++ curl_new/lib/connect.c 2005-04-24 16:01:21.000000000 -0700 @@ -652,7 +652,7 @@ /* set socket non-blocking */ Curl_nonblock(sockfd, TRUE); - rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen); + rc = connect(sockfd, ai->ai_addr, (socklen_t)ai->ai_addrlen); if(-1 == rc) { error = Curl_ourerrno(); diff -ur curl/lib/cookie.c curl_new/lib/cookie.c --- curl/lib/cookie.c 2005-03-30 23:02:03.000000000 -0800 +++ curl_new/lib/cookie.c 2005-04-24 16:01:05.312500000 -0700 @@ -309,7 +309,7 @@ break; } co->expires = - atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]) + now; + atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]) + (long)now; } else if(strequal("expires", name)) { co->expirestr=strdup(whatptr); @@ -317,7 +317,7 @@ badcookie = TRUE; break; } - co->expires = curl_getdate(what, &now); + co->expires = (long)curl_getdate(what, &now); } else if(!co->name) { co->name = strdup(name); diff -ur curl/lib/formdata.c curl_new/lib/formdata.c --- curl/lib/formdata.c 2004-12-22 12:12:15.000000000 -0800 +++ curl_new/lib/formdata.c 2005-04-24 16:07:49.718750000 -0700 @@ -464,7 +464,7 @@ return_value = CURL_FORMADD_OPTION_TWICE; else current_form->namelength = - array_state?(long)array_value:va_arg(params, long); + array_state?(long)array_value:(long)va_arg(params, long); break; /* @@ -1550,7 +1550,7 @@ if(!retstring) return NULL; /* failed */ - srand(time(NULL)+randomizer++); /* seed */ + srand((unsigned int)time(NULL)+randomizer++); /* seed */ strcpy(retstring, "----------------------------"); diff -ur curl/lib/ftp.c curl_new/lib/ftp.c --- curl/lib/ftp.c 2005-04-07 08:27:13.000000000 -0700 +++ curl_new/lib/ftp.c 2005-04-24 15:57:56.468750000 -0700 @@ -266,8 +266,8 @@ ptr=buf + ftp->nread_resp; - perline= ptr-ftp->linestart_resp; /* number of bytes in the current line, - so far */ + perline= (int)(ptr-ftp->linestart_resp); /* number of bytes in the current line, + so far */ keepon=TRUE; while((ftp->nread_respinfo.filetime = curl_getdate(buf, &secs); + data->info.filetime = (long)curl_getdate(buf, &secs); } /* If we asked for a time of the file and we actually got one as well, @@ -2086,7 +2086,7 @@ char *bytes; bytes=strstr(buf, " bytes"); if(bytes--) { - long in=bytes-buf; + ptrdiff_t in=(ptrdiff_t)(bytes-buf); /* this is a hint there is size information in there! ;-) */ while(--in) { /* scan for the left parenthesis and break there */ diff -ur curl/lib/hostthre.c curl_new/lib/hostthre.c --- curl/lib/hostthre.c 2005-04-19 16:19:23.000000000 -0700 +++ curl_new/lib/hostthre.c 2005-04-24 15:55:40.781250000 -0700 @@ -548,7 +548,7 @@ if (td && td->dummy_sock != CURL_SOCKET_BAD) { FD_SET(td->dummy_sock,write_fd_set); - *max_fdp = td->dummy_sock; + *max_fdp = (int)td->dummy_sock; } (void) read_fd_set; return CURLE_OK; diff -ur curl/lib/inet_pton.c curl_new/lib/inet_pton.c --- curl/lib/inet_pton.c 2004-12-17 12:18:53.000000000 -0800 +++ curl_new/lib/inet_pton.c 2005-04-24 15:55:26.046875000 -0700 @@ -114,7 +114,7 @@ const char *pch; if ((pch = strchr(digits, ch)) != NULL) { - u_int val = *tp * 10 + (pch - digits); + u_int val = *tp * 10 + (u_int)(pch - digits); if (val > 255) return (0); diff -ur curl/lib/md5.c curl_new/lib/md5.c --- curl/lib/md5.c 2004-12-14 17:38:25.000000000 -0800 +++ curl_new/lib/md5.c 2005-04-24 15:54:56.796875000 -0700 @@ -345,7 +345,7 @@ { 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 -ur curl/lib/mprintf.c curl_new/lib/mprintf.c --- curl/lib/mprintf.c 2004-12-14 17:38:25.000000000 -0800 +++ curl_new/lib/mprintf.c 2005-04-24 15:54:20.156250000 -0700 @@ -631,11 +631,7 @@ long base; /* Integral values to be written. */ -#ifdef ENABLE_64BIT - unsigned LONG_LONG num; -#else - unsigned long num; -#endif + size_t num; long signed_num; if (*f != '%') { @@ -759,8 +755,8 @@ *w-- = digits[num % base]; num /= base; } - width -= workend - w; - prec -= workend - w; + width -= (long)(workend - w); + prec -= (long)(workend - w); if (alt && base == 8 && prec <= 0) { *w-- = '0'; @@ -839,7 +835,7 @@ if (prec != -1 && (size_t) prec < len) len = prec; - width -= len; + width -= (long)len; if (p->flags & FLAGS_ALT) OUTCHAR('"'); @@ -869,7 +865,7 @@ base = 16; digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits; alt = 1; - num = (unsigned long) ptr; + num = (size_t) ptr; is_neg = 0; goto number; } diff -ur curl/lib/parsedate.c curl_new/lib/parsedate.c --- curl/lib/parsedate.c 2005-03-30 23:02:03.000000000 -0800 +++ curl_new/lib/parsedate.c 2005-04-24 15:51:25.562500000 -0700 @@ -398,7 +398,7 @@ /* Add the time zone diff (between the given timezone and GMT) and the diff between the local time zone and GMT. */ - delta = (tzoff!=-1?tzoff:0) + (t - t2); + delta = (long)((tzoff!=-1?tzoff:0) + (t - t2)); if((delta>0) && (t + delta < t)) return -1; /* time_t overflow */ diff -ur curl/lib/select.c curl_new/lib/select.c --- curl/lib/select.c 2005-03-30 23:02:03.000000000 -0800 +++ curl_new/lib/select.c 2005-04-24 15:50:40.078125000 -0700 @@ -151,7 +151,7 @@ } do { - r = select(maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout); + r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout); } while((r == -1) && (Curl_ourerrno() == EINTR)); if (r < 0) @@ -236,7 +236,7 @@ } do { - r = select(maxfd + 1, &fds_read, &fds_write, &fds_err, ptimeout); + r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, ptimeout); } while((r == -1) && (Curl_ourerrno() == EINTR)); if (r < 0) diff -ur curl/lib/sendf.c curl_new/lib/sendf.c --- curl/lib/sendf.c 2005-04-07 08:27:14.000000000 -0700 +++ curl_new/lib/sendf.c 2005-04-24 15:39:52.031250000 -0700 @@ -248,7 +248,7 @@ /* only TRUE if krb4 enabled */ bytes_written = Curl_sec_write(conn, sockfd, mem, len); else - bytes_written = (ssize_t)swrite(sockfd, mem, len); + bytes_written = (ssize_t)swrite(sockfd, mem, (int)len); if(-1 == bytes_written) { int err = Curl_ourerrno(); @@ -352,7 +352,7 @@ if(conn->sec_complete) nread = Curl_sec_read(conn, sockfd, buf, buffersize); else - nread = sread(sockfd, buf, buffersize); + nread = sread(sockfd, buf, (int)buffersize); if(-1 == nread) { int err = Curl_ourerrno(); diff -ur curl/lib/setup.h curl_new/lib/setup.h --- curl/lib/setup.h 2005-04-19 16:19:23.000000000 -0700 +++ curl_new/lib/setup.h 2005-04-24 15:28:06.671875000 -0700 @@ -32,7 +32,7 @@ #define CURL_DISABLE_GOPHER #endif -#if !defined(WIN32) && defined(__WIN32__) +#if !defined(WIN32) && (defined(_WIN32) || defined(WIN64) || defined(__WIN32__)) /* This should be a good Borland fix. Alexander J. Oss told us! */ #define WIN32 #endif @@ -44,6 +44,8 @@ #include "config-win32ce.h" #else #ifdef WIN32 +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE /* hand-modified win32 config.h! */ #include "config-win32.h" #endif diff -ur curl/lib/strerror.c curl_new/lib/strerror.c --- curl/lib/strerror.c 2005-03-14 23:47:59.000000000 -0800 +++ curl_new/lib/strerror.c 2005-04-24 15:39:51.968750000 -0700 @@ -571,7 +571,7 @@ else { if (!get_winsock_error(err, buf, max) && !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, - LANG_NEUTRAL, buf, max, NULL)) + LANG_NEUTRAL, buf, (DWORD)max, NULL)) snprintf(buf, max, "Unknown error %d (%#x)", err, err); } #endif diff -ur curl/lib/telnet.c curl_new/lib/telnet.c --- curl/lib/telnet.c 2005-03-14 23:48:45.000000000 -0800 +++ curl_new/lib/telnet.c 2005-04-24 15:39:51.937500000 -0700 @@ -858,7 +858,7 @@ snprintf((char *)temp, sizeof(temp), "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_TTYPE, CURL_TELQUAL_IS, tn->subopt_ttype, CURL_IAC, CURL_SE); - (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len); + (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, (int)len); printsub(data, '>', &temp[2], len-2); break; case CURL_TELOPT_XDISPLOC: @@ -866,7 +866,7 @@ snprintf((char *)temp, sizeof(temp), "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_XDISPLOC, CURL_TELQUAL_IS, tn->subopt_xdisploc, CURL_IAC, CURL_SE); - (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len); + (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, (int)len); printsub(data, '>', &temp[2], len-2); break; case CURL_TELOPT_NEW_ENVIRON: @@ -889,7 +889,7 @@ snprintf((char *)&temp[len], sizeof(temp) - len, "%c%c", CURL_IAC, CURL_SE); len += 2; - (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len); + (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, (int)len); printsub(data, '>', &temp[2], len-2); break; } diff -ur curl/lib/transfer.c curl_new/lib/transfer.c --- curl/lib/transfer.c 2005-04-08 09:59:13.000000000 -0700 +++ curl_new/lib/transfer.c 2005-04-24 15:37:13.484375000 -0700 @@ -270,9 +270,9 @@ ssize_t nread; /* number of bytes read */ int didwhat=0; - int fd_read; - int fd_write; - int select_res; + curl_socket_t fd_read; + curl_socket_t fd_write; + curl_socket_t select_res; curl_off_t contentlength; @@ -395,7 +395,7 @@ /* decrease the size of the remaining (supposed) header line */ rest_length = (k->end_ptr - k->str)+1; - nread -= rest_length; + nread -= (ssize_t)rest_length; k->str = k->end_ptr + 1; /* move past new line */ @@ -520,8 +520,8 @@ if(result) return result; - data->info.header_size += headerlen; - conn->headerbytecount += headerlen; + data->info.header_size += (long)headerlen; + conn->headerbytecount += (long)headerlen; conn->deductheadercount = (100 == k->httpcode)?conn->headerbytecount:0; @@ -900,7 +900,7 @@ k->timeofdoc = curl_getdate(k->p+strlen("Last-Modified:"), &secs); if(data->set.get_filetime) - data->info.filetime = k->timeofdoc; + data->info.filetime = (long)k->timeofdoc; } else if((checkprefix("WWW-Authenticate:", k->p) && (401 == k->httpcode)) || @@ -963,8 +963,8 @@ if(result) return result; - data->info.header_size += k->hbuflen; - conn->headerbytecount += k->hbuflen; + data->info.header_size += (long)k->hbuflen; + conn->headerbytecount += (long)k->hbuflen; /* reset hbufp pointer && hbuflen */ k->hbufp = data->state.headerbuff; @@ -1501,7 +1501,7 @@ *max_fd = -1; /* init */ if(conn->keep.keepon & KEEP_READ) { FD_SET(conn->sockfd, read_fd_set); - *max_fd = conn->sockfd; + *max_fd = (int)conn->sockfd; } if(conn->keep.keepon & KEEP_WRITE) { FD_SET(conn->writesockfd, write_fd_set); @@ -1509,7 +1509,7 @@ /* since sockets are curl_socket_t nowadays, we typecast it to int here to compare it nicely */ if((int)conn->writesockfd > *max_fd) - *max_fd = conn->writesockfd; + *max_fd = (int)conn->writesockfd; } /* we don't use exceptions, only touch that one to prevent compiler warnings! */ @@ -1553,8 +1553,8 @@ return CURLE_OK; while (!done) { - int fd_read; - int fd_write; + curl_socket_t fd_read; + curl_socket_t fd_write; int interval_ms; interval_ms = 1 * 1000; diff -ur curl/lib/url.c curl_new/lib/url.c --- curl/lib/url.c 2005-04-19 16:37:45.000000000 -0700 +++ curl_new/lib/url.c 2005-04-24 15:33:25.734375000 -0700 @@ -1748,7 +1748,7 @@ ssize_t written; int result; CURLcode code; - int sock = conn->sock[FIRSTSOCKET]; + curl_socket_t sock = conn->sock[FIRSTSOCKET]; Curl_nonblock(sock, FALSE);