summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-04-06 00:16:30 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-04-06 00:35:01 +0100
commitff853960bd7dcf6cfd0ea4ff6a91ea143e27fd4b (patch)
tree6f1139288db8ff0b88b51650b0512a9487f72137
parent2c49e960922129ba971bb4ee4a1767adf54ffae1 (diff)
downloadcurl-ff853960bd7dcf6cfd0ea4ff6a91ea143e27fd4b.tar.gz
sasl: Renamed SSPI module following short name clash
-rw-r--r--lib/Makefile.inc2
-rw-r--r--lib/curl_sasl_sspi.c (renamed from lib/sasl_sspi.c)0
-rw-r--r--packages/Symbian/group/libcurl.mmp2
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 79674dec6..7ed98641f 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -44,7 +44,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \
hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \
- http2.c sasl_sspi.c $(VSOURCES)
+ http2.c curl_sasl_sspi.c $(VSOURCES)
HHEADERS = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \
diff --git a/lib/sasl_sspi.c b/lib/curl_sasl_sspi.c
index 675118ede..675118ede 100644
--- a/lib/sasl_sspi.c
+++ b/lib/curl_sasl_sspi.c
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 064b5d4c8..5d7410abb 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -39,7 +39,7 @@ SOURCE \
http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c \
curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \
curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \
- vtls/curl_darwinssl.c bundles.c conncache.c sasl_sspi
+ vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c
USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL