- Fix build

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index a8659cdd5846f6cf894b0d4e4e9553950877e56c..0e5305cd804ff710087f576acee92b054315b005 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -327,7 +327,7 @@ static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC)
                } else if (obj->zo.ce == mysqli_driver_class_entry) {
                        f.handler = ZEND_FN(mysqli_driver_construct);
                } else if (obj->zo.ce == mysqli_warning_class_entry) {
-                       f.handler = ZEND_FN(mysqli_warning___construct);
+                       f.handler = ZEND_MN(mysqli_warning___construct);
                }
        
                return (union _zend_function*)&f;

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index eba63f928b223327d0018cc46aa62ee321f0fe6b..54bddadd524bc999c8d4101fe3f2ca9918bc2390 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -411,7 +411,7 @@ PHP_FUNCTION(mysqli_warning_count);
 ZEND_FUNCTION(mysqli_stmt_construct);
 ZEND_FUNCTION(mysqli_result_construct);
 ZEND_FUNCTION(mysqli_driver_construct);
-ZEND_METHOD(mysqli_warning,__construct);
+PHP_METHOD(mysqli_warning, __construct);
 
 ZEND_BEGIN_MODULE_GLOBALS(mysqli)
        long                    default_link;

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 259b24c1fd58c8344b1944dd0f00f289d92d6c6f..843df850c1be5daaa8c203e9a16bf042bf009665 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -278,7 +278,7 @@ PHP_METHOD(SoapParam, SoapParam);
 PHP_METHOD(SoapHeader, SoapHeader);
 
 #ifdef ZEND_ENGINE_2
-#define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct, ZEND_FN(class_name##_##func_name), arginfo, flags)
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct, ZEND_MN(class_name##_##func_name), arginfo, flags)
 #else
 #define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name, func_name, arginfo, flags)
 #endif
@@ -336,9 +336,9 @@ static zend_function_entry soap_client_functions[] = {
        SOAP_CTOR(SoapClient, SoapClient, NULL, 0)
        PHP_ME(SoapClient, __call, __call_args, 0)
 #ifdef ZEND_ENGINE_2
-       ZEND_FENTRY(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args, 0)
+       ZEND_FENTRY(__soapCall, ZEND_MN(SoapClient___call), __soap_call_args, 0)
 #else
-       ZEND_NAMED_FE(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args)
+       ZEND_NAMED_FE(__soapCall, ZEND_MN(SoapClient___call), __soap_call_args)
 #endif
        PHP_ME(SoapClient, __getLastRequest, NULL, 0)
        PHP_ME(SoapClient, __getLastResponse, NULL, 0)
@@ -508,7 +508,7 @@ PHP_MINIT_FUNCTION(soap)
                zend_internal_function fe;
 
                fe.type = ZEND_INTERNAL_FUNCTION;
-               fe.handler = ZEND_FN(SoapClient___call);
+               fe.handler = ZEND_MN(SoapClient___call);
                fe.function_name.v = NULL;
                fe.scope = NULL;
                fe.fn_flags = 0;