Use PHP_GINIT to suppress incompatible pointer type

diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
index 22d36183cba8c12031aaff032d994a47ea796775..f529637a70fd111651e2a85bf51975c46ad538e1 100644 (file)
--- 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');\r
 MySQLPDOTest::skip();\r
 ?>\r
+--INI--\r
+pdo_mysql.default_socket=/tmp/mysql2.sock\r
 --FILE--\r
 <?php\r
        require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');\r
@@ -30,4 +32,4 @@ MySQLPDOTest::skip();
        }\r
 ?>\r
 --EXPECTF--\r
-done!
\ No newline at end of file
+done!\r

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b56038dc53d39f10de33474fffa0bba3e48bc984..8e7bd6c40cb3467c784f78fa483175b7e6792009 100644 (file)
--- 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