DarwinSSL: several adjustments

- Renamed st_ function prefix to darwinssl_
- Renamed Curl_st_ function prefix to Curl_darwinssl_
- Moved the duplicated ssl_connect_done out of the #ifdef in lib/urldata.h
- Fixed a teensy little bug that made non-blocking connection attempts block
- Made it so that it builds cleanly against the iOS 5.1 SDK

1 files changed, 18 insertions, 17 deletions

diff --git a/lib/curl_darwinssl.h b/lib/curl_darwinssl.h
index 6eb20cc0f..a8d65d15e 100644
--- a/lib/curl_darwinssl.h
+++ b/lib/curl_darwinssl.h
@@ -25,38 +25,39 @@
 
 #ifdef USE_DARWINSSL
 
-CURLcode Curl_st_connect(struct connectdata *conn, int sockindex);
+CURLcode Curl_darwinssl_connect(struct connectdata *conn, int sockindex);
 
-CURLcode Curl_st_connect_nonblocking(struct connectdata *conn,
-                                     int sockindex,
-                                     bool *done);
+CURLcode Curl_darwinssl_connect_nonblocking(struct connectdata *conn,
+                                            int sockindex,
+                                            bool *done);
 
 /* this function doesn't actually do anything */
-void Curl_st_close_all(struct SessionHandle *data);
+void Curl_darwinssl_close_all(struct SessionHandle *data);
 
 /* close a SSL connection */
-void Curl_st_close(struct connectdata *conn, int sockindex);
+void Curl_darwinssl_close(struct connectdata *conn, int sockindex);
 
-size_t Curl_st_version(char *buffer, size_t size);
-int Curl_st_shutdown(struct connectdata *conn, int sockindex);
-int Curl_st_check_cxn(struct connectdata *conn);
-bool Curl_st_data_pending(const struct connectdata *conn, int connindex);
+size_t Curl_darwinssl_version(char *buffer, size_t size);
+int Curl_darwinssl_shutdown(struct connectdata *conn, int sockindex);
+int Curl_darwinssl_check_cxn(struct connectdata *conn);
+bool Curl_darwinssl_data_pending(const struct connectdata *conn,
+                                 int connindex);
 
 /* API setup for SecureTransport */
 #define curlssl_init() (1)
 #define curlssl_cleanup() Curl_nop_stmt
-#define curlssl_connect Curl_st_connect
-#define curlssl_connect_nonblocking Curl_st_connect_nonblocking
+#define curlssl_connect Curl_darwinssl_connect
+#define curlssl_connect_nonblocking Curl_darwinssl_connect_nonblocking
 #define curlssl_session_free(x) Curl_nop_stmt
-#define curlssl_close_all Curl_st_close_all
-#define curlssl_close Curl_st_close
+#define curlssl_close_all Curl_darwinssl_close_all
+#define curlssl_close Curl_darwinssl_close
 #define curlssl_shutdown(x,y) 0
 #define curlssl_set_engine(x,y) (x=x, y=y, CURLE_NOT_BUILT_IN)
 #define curlssl_set_engine_default(x) (x=x, CURLE_NOT_BUILT_IN)
 #define curlssl_engines_list(x) (x=x, (struct curl_slist *)NULL)
-#define curlssl_version Curl_st_version
-#define curlssl_check_cxn Curl_st_check_cxn
-#define curlssl_data_pending(x,y) Curl_st_data_pending(x, y)
+#define curlssl_version Curl_darwinssl_version
+#define curlssl_check_cxn Curl_darwinssl_check_cxn
+#define curlssl_data_pending(x,y) Curl_darwinssl_data_pending(x, y)
 
 #endif /* USE_DARWINSSL */
 #endif /* HEADER_CURL_DARWINSSL_H */
\ No newline at end of file