mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 11:35:07 -05:00
Philip Gladstone's 64-bit sparc native compiler compatibility issues fixed.
This commit is contained in:
parent
221ecd0a30
commit
fe37fb5921
@ -193,7 +193,7 @@ static CURLcode bindlocal(struct connectdata *conn,
|
|||||||
#ifdef HAVE_INET_NTOA
|
#ifdef HAVE_INET_NTOA
|
||||||
|
|
||||||
#ifndef INADDR_NONE
|
#ifndef INADDR_NONE
|
||||||
#define INADDR_NONE (unsigned long) ~0
|
#define INADDR_NONE (in_addr_t) ~0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct SessionHandle *data = conn->data;
|
struct SessionHandle *data = conn->data;
|
||||||
@ -207,7 +207,7 @@ static CURLcode bindlocal(struct connectdata *conn,
|
|||||||
char *hostdataptr=NULL;
|
char *hostdataptr=NULL;
|
||||||
size_t size;
|
size_t size;
|
||||||
char myhost[256] = "";
|
char myhost[256] = "";
|
||||||
unsigned long in;
|
in_addr_t in;
|
||||||
|
|
||||||
if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
|
if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
|
||||||
h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr);
|
h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr);
|
||||||
@ -236,7 +236,8 @@ static CURLcode bindlocal(struct connectdata *conn,
|
|||||||
|
|
||||||
infof(data, "We bind local end to %s\n", myhost);
|
infof(data, "We bind local end to %s\n", myhost);
|
||||||
|
|
||||||
if ( (in=inet_addr(myhost)) != INADDR_NONE ) {
|
in=inet_addr(myhost);
|
||||||
|
if (INADDR_NONE != in) {
|
||||||
|
|
||||||
if ( h ) {
|
if ( h ) {
|
||||||
memset((char *)&sa, 0, sizeof(sa));
|
memset((char *)&sa, 0, sizeof(sa));
|
||||||
|
@ -1211,10 +1211,10 @@ CURLcode ftp_use_port(struct connectdata *conn)
|
|||||||
if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
|
if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
|
||||||
/* we succeeded to bind */
|
/* we succeeded to bind */
|
||||||
struct sockaddr_in add;
|
struct sockaddr_in add;
|
||||||
size = sizeof(add);
|
socklen_t socksize = sizeof(add);
|
||||||
|
|
||||||
if(getsockname(portsock, (struct sockaddr *) &add,
|
if(getsockname(portsock, (struct sockaddr *) &add,
|
||||||
(socklen_t *)&size)<0) {
|
&socksize)<0) {
|
||||||
failf(data, "getsockname() failed");
|
failf(data, "getsockname() failed");
|
||||||
return CURLE_FTP_PORT_FAILED;
|
return CURLE_FTP_PORT_FAILED;
|
||||||
}
|
}
|
||||||
|
@ -265,7 +265,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
|
|||||||
char **bufp)
|
char **bufp)
|
||||||
{
|
{
|
||||||
struct hostent *h = NULL;
|
struct hostent *h = NULL;
|
||||||
unsigned long in;
|
in_addr_t in;
|
||||||
int ret; /* this variable is unused on several platforms but used on some */
|
int ret; /* this variable is unused on several platforms but used on some */
|
||||||
|
|
||||||
#define CURL_NAMELOOKUP_SIZE 9000
|
#define CURL_NAMELOOKUP_SIZE 9000
|
||||||
|
Loading…
Reference in New Issue
Block a user