diff options
| author | Nick Zitzmann <nick@chronosnet.com> | 2012-06-26 21:39:48 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-06-26 21:39:48 +0200 |
| commit | 3a4b28d473e7c02fe8d2e30c25861eea2d8d0d22 (patch) | |
| tree | 41beff474d5a53ef30ed4e0de40cab38ac24eaf2 /lib/urldata.h | |
| parent | f1474db3600172804d6f79d30e1127c6c7efa066 (diff) | |
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
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index dfb4fab9f..5ad07c5f1 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -141,6 +141,9 @@ #ifdef USE_DARWINSSL #include <Security/Security.h> +/* For some reason, when building for iOS, the omnibus header above does + * not include SecureTransport.h as of iOS SDK 5.1. */ +#include <Security/SecureTransport.h> #endif #ifdef HAVE_NETINET_IN_H @@ -245,13 +248,11 @@ typedef enum { ssl_connect_2, ssl_connect_2_reading, ssl_connect_2_writing, - ssl_connect_3, #ifdef USE_DARWINSSL - ssl_connect_done, - ssl_connect_2_wouldblock -#else - ssl_connect_done + ssl_connect_2_wouldblock, #endif /* USE_DARWINSSL */ + ssl_connect_3, + ssl_connect_done } ssl_connect_state; typedef enum { |