Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed post deactivate signature in ext\libxml
This commit is contained in:
Anatol Belski 2014-01-21 17:15:12 +01:00
commit 4b7148711b

View File

@ -88,7 +88,7 @@ static PHP_MINIT_FUNCTION(libxml);
static PHP_RINIT_FUNCTION(libxml);
static PHP_MSHUTDOWN_FUNCTION(libxml);
static PHP_MINFO_FUNCTION(libxml);
static int php_libxml_post_deactivate();
static int php_libxml_post_deactivate(void);
/* }}} */
@ -876,7 +876,7 @@ static PHP_MSHUTDOWN_FUNCTION(libxml)
return SUCCESS;
}
static int php_libxml_post_deactivate()
static int php_libxml_post_deactivate(void)
{
TSRMLS_FETCH();
/* reset libxml generic error handling */