diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index 679289db6..73f3d3d96 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -412,15 +412,15 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, */ ntlm->p_identity = &ntlm->identity; memset(ntlm->p_identity, 0, sizeof(*ntlm->p_identity)); - if ((ntlm->identity.User = strdup(user)) == NULL) + if ((ntlm->identity.User = (unsigned char *)strdup(user)) == NULL) return CURLE_OUT_OF_MEMORY; ntlm->identity.UserLength = strlen(user); - if ((ntlm->identity.Password = strdup(passwdp)) == NULL) + if ((ntlm->identity.Password = (unsigned char *)strdup(passwdp)) == NULL) return CURLE_OUT_OF_MEMORY; ntlm->identity.PasswordLength = strlen(passwdp); if ((ntlm->identity.Domain = malloc(domlen+1)) == NULL) return CURLE_OUT_OF_MEMORY; - strncpy(ntlm->identity.Domain, domain, domlen); + strncpy((char *)ntlm->identity.Domain, domain, domlen); ntlm->identity.Domain[domlen] = '\0'; ntlm->identity.DomainLength = domlen; ntlm->identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; @@ -430,7 +430,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, } if (AcquireCredentialsHandle( - NULL, "NTLM", SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, + NULL, (char *)"NTLM", SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, NULL, NULL, &ntlm->handle, NULL ) != SEC_E_OK) { return CURLE_OUT_OF_MEMORY; diff --git a/lib/if2ip.c b/lib/if2ip.c index 8f0a07782..db28e4aad 100644 --- a/lib/if2ip.c +++ b/lib/if2ip.c @@ -31,6 +31,8 @@ #include #endif +#include "if2ip.h" + #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \ !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) @@ -55,7 +57,6 @@ #include #endif -/* -- if2ip() -- */ #ifdef HAVE_NETDB_H #include #endif @@ -72,7 +73,6 @@ #include #endif -#include "if2ip.h" #include "memory.h" /* The last #include file should be: */