By request, change the name of "curl_darwinssl.[ch]" to "darwinssl.[ch]"

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index e4ce0bb3eb3190c8dad5ef27f494c81ee9f2162f..c43077b2d9620fbde55529a1db181a0a0dedb305 100644 (file)
--- 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 3abc9c2d0e36f2c18818365d164a245b699c8ee8..637a41bc09491ed853bea6c8dd4b0473d829bb03 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -534,7 +534,6 @@ X_OBJS= \
        $(DIROBJ)\content_encoding.obj \\r
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
-       $(DIROBJ)\curl_darwinssl.obj \\r
        $(DIROBJ)\curl_des.obj \\r
        $(DIROBJ)\curl_endian.obj \\r
        $(DIROBJ)\curl_fnmatch.obj \\r
@@ -553,6 +552,7 @@ X_OBJS= \
        $(DIROBJ)\curl_sspi.obj \\r
        $(DIROBJ)\curl_threads.obj \\r
        $(DIROBJ)\cyassl.obj \\r
+       $(DIROBJ)\darwinlssl.obj\r
        $(DIROBJ)\dict.obj \\r
        $(DIROBJ)\dotdot.obj \\r
        $(DIROBJ)\easy.obj \\r

diff --git a/lib/vtls/curl_darwinssl.c b/lib/vtls/darwinssl.c
similarity index 99%
rename from lib/vtls/curl_darwinssl.c
rename to lib/vtls/darwinssl.c
index f96bcbb1eca3bd05e466c91f536f04d6e9f6163d..6129eb01592183f2c7aeca0da14e9eb6d5ae8c43 100644 (file)
--- 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
similarity index 100%
rename from lib/vtls/curl_darwinssl.h
rename to lib/vtls/darwinssl.h

diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index e56a8b62d0d490afc974e65103d37170385609fa..bbaa8505ffd15ef99aa1898ba4f2d2d2cdd0fc0c 100644 (file)
--- 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 a9c884d171990f266ab854343b3ee8652a5a16de..f016d37058523a3c807eafd49abc72c9d07d61dc 100644 (file)
--- 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