com php-src: Revert "fix TS build": ext/openssl/xp_ssl.c
| From: | Ferenc Kovacs | Date: | Wed, 24 Sep 2014 08:15:53 +0000 |
| Subject: | com php-src: Revert "fix TS build": ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81900@lists.php.net to get a copy of this message | ||
Commit: 43c72ea2cbd8994d624c8fab91bb4d5e21fcd6e2
Author: Ferenc Kovacs <tyrael@php.net> Wed, 24 Sep 2014 10:15:53 +0200
Parents: dc5f587e07d14c242dc93d169c28d99b07c24215
Branches: PHP-5.6.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43c72ea2cbd8994d624c8fab91bb4d5e21fcd6e2
Log:
Revert "fix TS build"
This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 0a85d77..e6b7784 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1804,7 +1804,7 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf,
size
}
/* }}} */
-static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)
+static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)
{
int retval;
struct timeval *ptimeout;