com php-src: fix linkage: ext/openssl/openssl.c ext/openssl/xp _ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 22:09:16 +0000 |
| Subject: | com php-src: fix linkage: ext/openssl/openssl.c ext/openssl/xp _ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76180@lists.php.net to get a copy of this message | ||
Commit: 5b6ef90bc0de63d2aa1f91d52b46021313aa18b5
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 23:09:16 +0100
Parents: 865a41a6a3f6b4cfc9d3e253d62bc5a3617cd6dd
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b6ef90bc0de63d2aa1f91d52b46021313aa18b5
Log:
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.
Changed paths:
M ext/openssl/openssl.c
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index c813a7e..e649fca 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 7166417..8971cda 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;