diff options
| author | Anatol Belski <ab@php.net> | 2014-01-21 17:14:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-21 17:14:56 +0100 |
| commit | 6e3fae4390c4fa9ae2ded001d72ebed158fcae7a (patch) | |
| tree | 25927f0dc8b3afff1336da7b91291120c782053d /ext/libxml | |
| parent | 4d43e2efdb2760d4b131903fd86eb44218a26c9b (diff) | |
| parent | c6f2581c39a651ce812e77d4901289910816930d (diff) | |
| download | php-git-6e3fae4390c4fa9ae2ded001d72ebed158fcae7a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed post deactivate signature in ext\libxml
Diffstat (limited to '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 2e6e00b106..3114b25199 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); /* }}} */ @@ -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 */ |