aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2015-02-07 20:50:30 +0000
committerSteve Holme <steve_holme@hotmail.com>2015-02-07 21:34:33 +0000
commit761d5166aff64c877a72fff48a5f754dfa1ab4e0 (patch)
treedd640f6733fc6500a3ecea412cb90f9566487b7a /lib
parent05792d69363fb90dc11d763d540da8ec78e7ff41 (diff)
schannel: Removed curl_ prefix from source files
Removed the curl_ prefix from the schannel source files as discussed with Marc and Daniel at FOSDEM.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.inc4
-rw-r--r--lib/Makefile.vc62
-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.h2
5 files changed, 5 insertions, 5 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