Merge branch 'master' of github.com:cyassl/cyassl

This commit is contained in:
John Safranek
2012-09-27 11:42:57 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -502,7 +502,7 @@ static INLINE void tcp_set_nonblocking(SOCKET_T* sockfd)
int ret = ioctlsocket(*sockfd, FIONBIO, &blocking); int ret = ioctlsocket(*sockfd, FIONBIO, &blocking);
#else #else
int flags = fcntl(*sockfd, F_GETFL, 0); int flags = fcntl(*sockfd, F_GETFL, 0);
int ret = fcntl(*sockfd, F_SETFL, flags | O_NONBLOCK); fcntl(*sockfd, F_SETFL, flags | O_NONBLOCK);
#endif #endif
#endif #endif
(void)sockfd; (void)sockfd;

View File

@@ -40,7 +40,7 @@
#endif #endif
#if defined(NON_BLOCKING) || defined(CYASSL_CALLBACKS) #if defined(NON_BLOCKING) || defined(CYASSL_CALLBACKS)
void NonBlockingSSL_Connect(CYASSL* ssl) static void NonBlockingSSL_Connect(CYASSL* ssl)
{ {
#ifndef CYASSL_CALLBACKS #ifndef CYASSL_CALLBACKS
int ret = CyaSSL_connect(ssl); int ret = CyaSSL_connect(ssl);

View File

@@ -36,7 +36,7 @@
#endif #endif
#if defined(NON_BLOCKING) || defined(CYASSL_CALLBACKS) #if defined(NON_BLOCKING) || defined(CYASSL_CALLBACKS)
void NonBlockingSSL_Accept(SSL* ssl) static void NonBlockingSSL_Accept(SSL* ssl)
{ {
#ifndef CYASSL_CALLBACKS #ifndef CYASSL_CALLBACKS
int ret = SSL_accept(ssl); int ret = SSL_accept(ssl);