From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 5 Apr 2014 23:16:30 +0000 (+0100)
Subject: sasl: Renamed SSPI module following short name clash
X-Git-Tag: upstream/7.37.1~357
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff853960bd7dcf6cfd0ea4ff6a91ea143e27fd4b;p=platform%2Fupstream%2Fcurl.git

sasl: Renamed SSPI module following short name clash
---

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 79674de..7ed9864 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
similarity index 100%
rename from lib/sasl_sspi.c
rename to lib/curl_sasl_sspi.c
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 064b5d4..5d7410a 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