php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use PHP_GINIT to suppress incompatible pointer type

Browse Source
This commit is contained in:
Xinchen Hui
2014-09-04 11:56:13 +08:00
parent d85ab21ac4
commit e90ec235dc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
View File

@@ -6,6 +6,8 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
?>
--INI--
pdo_mysql.default_socket=/tmp/mysql2.sock
--FILE--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
@@ -30,4 +32,4 @@ MySQLPDOTest::skip();
}
?>
--EXPECTF--
done!
done!

4
ext/zlib/zlib.c
View File

@@ -1006,7 +1006,7 @@ static PHP_MINFO_FUNCTION(zlib)
/* }}} */
/* {{{ ZEND_MODULE_GLOBALS_CTOR */
static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
static PHP_GINIT_FUNCTION(zlib)
{
zlib_globals->ob_gzhandler = NULL;
zlib_globals->handler_registered = 0;
@@ -1025,7 +1025,7 @@ zend_module_entry php_zlib_module_entry = {
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
ZEND_MODULE_GLOBALS_CTOR_N(zlib),
PHP_GINIT(zlib),
NULL,
NULL,
STANDARD_MODULE_PROPERTIES_EX