diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
| commit | a4a120d66aaf44cd0dc71f39a49998b924c2ef0e (patch) | |
| tree | f48300cf85374f82a437a42f3a2d4ed88867f34d /ext/libxml/libxml.c | |
| parent | 8a7e2f8dd2116ff6ada654e301c593accf337250 (diff) | |
| parent | 05c309f2d85bcc33e95415d7f50d7748a7c27498 (diff) | |
| download | php-git-a4a120d66aaf44cd0dc71f39a49998b924c2ef0e.tar.gz | |
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Diffstat (limited to 'ext/libxml/libxml.c')
| -rw-r--r-- | ext/libxml/libxml.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 05b8df4d0d..3114b25199 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -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 */ |