Merge branch 'PHP-5.6'

weltling · weltling · commit 6936c7a1bb01 · 2014-08-07T19:51:04.000+02:00
* PHP-5.6:
  fix TS build
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -1800,7 +1800,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 TSRMLS_DC)
+static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)
 {
 	int retval;
 	struct timeval *ptimeout;

Original file line number	Diff line number	Diff line change
`@@ -1800,7 +1800,7 @@ static size_t php_openssl_sockop_write(php_stream stream, const char buf, size`
`1800`	`1800`	`}`
`1801`	`1801`	`/* }}} */`
`1802`	`1802`
`1803`		`-static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)`
	`1803`	`+static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)`
`1804`	`1804`	`{`
`1805`	`1805`	`int retval;`
`1806`	`1806`	`struct timeval *ptimeout;`