Merge branch 'PHP-7.1'

This commit is contained in:
Jakub Zelenka 2016-11-27 19:00:57 +00:00
commit 42155c3631

View File

@ -1208,7 +1208,7 @@ static void php_openssl_dispose_config(struct php_x509_request * req) /* {{{ */
}
/* }}} */
#ifdef PHP_WIN32
#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
#define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0)
#else
#define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval()