com php-src: Change declaration of subtractTimeval and compareTimeval to static: ext/openssl/xp_ssl.c

Commit: 9ec7fac127f1f57974a823f1b75c2f8d23088432 Author: Brad Broerman <bbroerman@bbroerman.net> Sat, 10 Jan 2015 11:19:17 -0500 Parents: 8ded274413590a073a2412098ba3e5413d481ef6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ec7fac127f1f57974a823f1b75c2f8d23088432 Log: Change declaration of subtractTimeval and compareTimeval to static Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 5950021..e92a039 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -78,8 +78,8 @@ extern php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl); extern zend_string* php_openssl_x509_fingerprint(X509 *peer, const char *method, zend_bool raw); extern int php_openssl_get_ssl_stream_data_index(); extern int php_openssl_get_x509_list_id(void); -struct timeval subtractTimeval( struct timeval a, struct timeval b ); -int compareTimeval( struct timeval a, struct timeval b ); +static struct timeval subtractTimeval( struct timeval a, struct timeval b ); +static int compareTimeval( struct timeval a, struct timeval b ); static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, size_t count TSRMLS_DC); php_stream_ops php_openssl_socket_ops; @@ -1903,7 +1903,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz } /* }}} */ -struct timeval subtractTimeval( struct timeval a, struct timeval b ) +static struct timeval subtractTimeval( struct timeval a, struct timeval b ) { struct timeval difference; @@ -1918,7 +1918,7 @@ struct timeval subtractTimeval( struct timeval a, struct timeval b ) return difference; } -int compareTimeval( struct timeval a, struct timeval b ) +static int compareTimeval( struct timeval a, struct timeval b ) { if (a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec > b.tv_usec) ) { return 1;