diff options
| -rw-r--r-- | lib/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/Makefile.vc6 | 2 | ||||
| -rw-r--r-- | lib/vtls/darwinssl.c (renamed from lib/vtls/curl_darwinssl.c) | 2 | ||||
| -rw-r--r-- | lib/vtls/darwinssl.h (renamed from lib/vtls/curl_darwinssl.h) | 0 | ||||
| -rw-r--r-- | lib/vtls/vtls.h | 2 | ||||
| -rw-r--r-- | packages/Symbian/group/libcurl.mmp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e4ce0bb3e..c43077b2d 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/schannel.c vtls/curl_darwinssl.c vtls/gskit.c + vtls/cyassl.c vtls/schannel.c vtls/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/schannel.h vtls/curl_darwinssl.h vtls/gskit.h + vtls/cyassl.h vtls/schannel.h vtls/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 3abc9c2d0..637a41bc0 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -534,7 +534,6 @@ X_OBJS= \ $(DIROBJ)\content_encoding.obj \
$(DIROBJ)\cookie.obj \
$(DIROBJ)\curl_addrinfo.obj \
- $(DIROBJ)\curl_darwinssl.obj \
$(DIROBJ)\curl_des.obj \
$(DIROBJ)\curl_endian.obj \
$(DIROBJ)\curl_fnmatch.obj \
@@ -553,6 +552,7 @@ X_OBJS= \ $(DIROBJ)\curl_sspi.obj \
$(DIROBJ)\curl_threads.obj \
$(DIROBJ)\cyassl.obj \
+ $(DIROBJ)\darwinlssl.obj
$(DIROBJ)\dict.obj \
$(DIROBJ)\dotdot.obj \
$(DIROBJ)\easy.obj \
diff --git a/lib/vtls/curl_darwinssl.c b/lib/vtls/darwinssl.c index f96bcbb1e..6129eb015 100644 --- a/lib/vtls/curl_darwinssl.c +++ b/lib/vtls/darwinssl.c @@ -102,7 +102,7 @@ #include "connect.h" #include "select.h" #include "vtls.h" -#include "curl_darwinssl.h" +#include "darwinssl.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> diff --git a/lib/vtls/curl_darwinssl.h b/lib/vtls/darwinssl.h index ae6868265..ae6868265 100644 --- a/lib/vtls/curl_darwinssl.h +++ b/lib/vtls/darwinssl.h diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index e56a8b62d..bbaa8505f 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -31,7 +31,7 @@ #include "axtls.h" /* axTLS versions */ #include "cyassl.h" /* CyaSSL versions */ #include "schannel.h" /* Schannel SSPI version */ -#include "curl_darwinssl.h" /* SecureTransport (Darwin) version */ +#include "darwinssl.h" /* SecureTransport (Darwin) version */ #ifndef MAX_PINNED_PUBKEY_SIZE #define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1MB */ diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index a9c884d17..f016d3705 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -38,7 +38,7 @@ 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/schannel.c curl_multibyte.c vtls/curl_darwinssl.c \ + curl_sasl.c vtls/schannel.c curl_multibyte.c vtls/darwinssl.c \ bundles.c conncache.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c \ curl_endian.c curl_des.c |