diff options
| author | Xinchen Hui <laruence@php.net> | 2014-09-04 11:56:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-09-04 11:56:13 +0800 |
| commit | e90ec235dc0eaae2eef2d2db585f619bfff6c5ee (patch) | |
| tree | cac48cfde2ecb2d33f5d511f258ec367e5117efe | |
| parent | d85ab21ac44873d4be6ea44c91a002ceac6b08fa (diff) | |
| download | php-git-e90ec235dc0eaae2eef2d2db585f619bfff6c5ee.tar.gz | |
Use PHP_GINIT to suppress incompatible pointer type
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt | 4 | ||||
| -rw-r--r-- | 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--
<?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 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 |