com php-src: Use PHP_GINIT to suppress incompatible p ointer type: ext/pdo_mysql/tests/pdo_mysql_connect _charset.phpt ext/zlib/zlib.c

From: Date: Thu, 04 Sep 2014 03:56:13 +0000
Subject: com php-src: Use PHP_GINIT to suppress incompatible p ointer type: ext/pdo_mysql/tests/pdo_mysql_connect _charset.phpt ext/zlib/zlib.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81418@lists.php.net to get a copy of this message
Commit: e90ec235dc0eaae2eef2d2db585f619bfff6c5ee Author: Xinchen Hui <laruence@php.net> Thu, 4 Sep 2014 11:56:13 +0800 Parents: d85ab21ac44873d4be6ea44c91a002ceac6b08fa Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e90ec235dc0eaae2eef2d2db585f619bfff6c5ee Log: Use PHP_GINIT to suppress incompatible pointer type Changed paths: M ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt M ext/zlib/zlib.c Diff: diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt index 22d3618..f529637 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt @@ -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! \ No newline at end of file +done! diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index b56038d..8e7bd6c 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -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

« previous php.cvs (#81418) next »