From d56e8bcc8aeed07d73a3047c5a5be8bb9df53e0b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 16 Jun 2012 19:20:50 +0200 Subject: Win32: downplay MS bazillion type synonyms game Avoid usage of some MS type synonyms to allow compilation with compiler headers that don't define these, using simpler synonyms. --- lib/socks_sspi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/socks_sspi.c') diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index a1d82ea76..43e0064a5 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -90,7 +90,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, TimeStamp expiry; char *service_name = NULL; unsigned short us_length; - ULONG qop; + unsigned long qop; unsigned char socksreq[4]; /* room for gssapi exchange header only */ char *service = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE]; @@ -141,7 +141,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, cred_handle.dwUpper = 0; status = s_pSecFn->AcquireCredentialsHandle(NULL, - (SECURITY_PSTR) TEXT("Kerberos"), + (TCHAR *) TEXT("Kerberos"), SECPKG_CRED_OUTBOUND, NULL, NULL, @@ -160,7 +160,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, /* As long as we need to keep sending some context info, and there's no */ /* errors, keep sending it... */ for(;;) { - LPTSTR sname; + TCHAR *sname; #ifdef UNICODE sname = Curl_convert_UTF8_to_wchar(service_name); if(!sname) -- cgit v1.2.3