diff options
| -rw-r--r-- | lib/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/Makefile.vc6 | 2 | ||||
| -rw-r--r-- | lib/vtls/schannel.c (renamed from lib/vtls/curl_schannel.c) | 2 | ||||
| -rw-r--r-- | lib/vtls/schannel.h (renamed from lib/vtls/curl_schannel.h) | 0 | ||||
| -rw-r--r-- | lib/vtls/vtls.h | 2 | ||||
| -rw-r--r-- | packages/Symbian/group/libcurl.mmp | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 4f81cd07b..e4ce0bb3e 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -22,11 +22,11 @@ LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c \ - vtls/cyassl.c vtls/curl_schannel.c vtls/curl_darwinssl.c vtls/gskit.c + vtls/cyassl.c vtls/schannel.c vtls/curl_darwinssl.c vtls/gskit.c LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h \ vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h \ - vtls/cyassl.h vtls/curl_schannel.h vtls/curl_darwinssl.h vtls/gskit.h + vtls/cyassl.h vtls/schannel.h vtls/curl_darwinssl.h vtls/gskit.h LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 8e0314604..3abc9c2d0 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -550,7 +550,6 @@ X_OBJS= \ $(DIROBJ)\curl_sasl.obj \
$(DIROBJ)\curl_sasl_gssapi.obj \
$(DIROBJ)\curl_sasl_sspi.obj \
- $(DIROBJ)\curl_schannel.obj \
$(DIROBJ)\curl_sspi.obj \
$(DIROBJ)\curl_threads.obj \
$(DIROBJ)\cyassl.obj \
@@ -608,6 +607,7 @@ X_OBJS= \ $(DIROBJ)\progress.obj \
$(DIROBJ)\rawstr.obj \
$(DIROBJ)\rtsp.obj \
+ $(DIROBJ)\schannel.obj \
$(DIROBJ)\security.obj \
$(DIROBJ)\select.obj \
$(DIROBJ)\sendf.obj \
diff --git a/lib/vtls/curl_schannel.c b/lib/vtls/schannel.c index b02a187f4..00ed0f6b8 100644 --- a/lib/vtls/curl_schannel.c +++ b/lib/vtls/schannel.c @@ -47,7 +47,7 @@ #endif #include "curl_sspi.h" -#include "curl_schannel.h" +#include "schannel.h" #include "vtls.h" #include "sendf.h" #include "connect.h" /* for the connect timeout */ diff --git a/lib/vtls/curl_schannel.h b/lib/vtls/schannel.h index e019a8606..e019a8606 100644 --- a/lib/vtls/curl_schannel.h +++ b/lib/vtls/schannel.h diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index 96321ec98..e56a8b62d 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -30,7 +30,7 @@ #include "polarssl.h" /* PolarSSL versions */ #include "axtls.h" /* axTLS versions */ #include "cyassl.h" /* CyaSSL versions */ -#include "curl_schannel.h" /* Schannel SSPI version */ +#include "schannel.h" /* Schannel SSPI version */ #include "curl_darwinssl.h" /* SecureTransport (Darwin) version */ #ifndef MAX_PINNED_PUBKEY_SIZE diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 3b7303aea..a9c884d17 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -38,9 +38,9 @@ SOURCE \ vtls/axtls.c idn_win32.c http_negotiate_sspi.c vtls/cyassl.c \ 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 curl_sasl_sspi.c smb.c \ - curl_sasl_gssapi.c curl_endian.c curl_des.c + curl_sasl.c vtls/schannel.c curl_multibyte.c vtls/curl_darwinssl.c \ + bundles.c conncache.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c \ + curl_endian.c curl_des.c USERINCLUDE ../../../lib ../../../include/curl #ifdef ENABLE_SSL |