Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit 6e3fae4390c4 · 2014-01-21T17:14:56.000+01:00
* PHP-5.5:
  fixed post deactivate signature in ext\libxml
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static PHP_MINIT_FUNCTION(libxml);`
`88`	`88`	`static PHP_RINIT_FUNCTION(libxml);`
`89`	`89`	`static PHP_MSHUTDOWN_FUNCTION(libxml);`
`90`	`90`	`static PHP_MINFO_FUNCTION(libxml);`
`91`		`-static int php_libxml_post_deactivate();`
	`91`	`+static int php_libxml_post_deactivate(void);`
`92`	`92`
`93`	`93`	`/* }}} */`
`94`	`94`
`@@ -876,7 +876,7 @@ static PHP_MSHUTDOWN_FUNCTION(libxml)`
`876`	`876`	`return SUCCESS;`
`877`	`877`	`}`
`878`	`878`
`879`		`-static int php_libxml_post_deactivate()`
	`879`	`+static int php_libxml_post_deactivate(void)`
`880`	`880`	`{`
`881`	`881`	`TSRMLS_FETCH();`
`882`	`882`	`/* reset libxml generic error handling */`