From 5b6ef90bc0de63d2aa1f91d52b46021313aa18b5 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 21 Feb 2014 23:09:16 +0100 Subject: [PATCH] fix linkage "extern inline" looks like tricky case for portability, but extern is required with VS. So reduce the case to a starndard one to avoid unporbatibily. --- ext/openssl/openssl.c | 2 +- ext/openssl/xp_ssl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index c813a7ea29..e649fca795 100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -585,7 +585,7 @@ inline static int php_openssl_open_base_dir_chk(char *filename TSRMLS_DC) } /* }}} */ -inline php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl) +php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl) { return (php_stream*)SSL_get_ex_data(ssl, ssl_stream_data_index); } diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 71664175a0..8971cdabc1 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -51,7 +51,7 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC); SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC); -php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl); +extern php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl); int php_openssl_get_x509_list_id(void); php_stream_ops php_openssl_socket_ops; -- 2.50.1