From e90ec235dc0eaae2eef2d2db585f619bfff6c5ee Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 4 Sep 2014 11:56:13 +0800 Subject: [PATCH] Use PHP_GINIT to suppress incompatible pointer type --- ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt | 4 +++- ext/zlib/zlib.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt index 22d36183cb..f529637a70 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-- --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index b56038dc53..8e7bd6c40c 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 -- 2.50.1