Merge branch 'PHP-7.2'

This commit is contained in:
Nikita Popov 2018-03-23 21:14:58 +01:00
commit bd4b203585

View File

@ -350,6 +350,7 @@ static void php_load_php_extension_cb(void *arg)
/* {{{ php_load_zend_extension_cb
*/
#ifdef HAVE_LIBDL
static void php_load_zend_extension_cb(void *arg)
{
char *filename = *((char **) arg);
@ -409,6 +410,9 @@ static void php_load_zend_extension_cb(void *arg)
efree(libpath);
}
}
#else
static void php_load_zend_extension_cb(void *arg) { }
#endif
/* }}} */
/* {{{ php_init_config