diff options
| author | Anatol Belski <ab@php.net> | 2014-01-21 17:14:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-21 17:14:32 +0100 |
| commit | c6f2581c39a651ce812e77d4901289910816930d (patch) | |
| tree | 2bfdfbe6fd8082b3c5945e16bb9e4bde1c43dc73 | |
| parent | 09eb3cf38119a488d0c7e40c30539008e78f2838 (diff) | |
| parent | fb721cefe77819416d9d916a0f608aa92c3f187a (diff) | |
| download | php-git-c6f2581c39a651ce812e77d4901289910816930d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed post deactivate signature in ext\libxml
| -rw-r--r-- | ext/libxml/libxml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 083d9f815e..2438463ebb 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -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); /* }}} */ @@ -875,7 +875,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 */ |