diff options
| author | Marcus Boerger <helly@php.net> | 2006-03-05 17:31:44 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-03-05 17:31:44 +0000 |
| commit | 20273c4fe977751f1cf96ca8fa500b9b0fe8846d (patch) | |
| tree | 440c6e6d2067939f5cf59fc60bc165b7b7adee55 | |
| parent | d9b2a3372e7d7955d8ea1ef45ef09ce69ee00c32 (diff) | |
| download | php-git-20273c4fe977751f1cf96ca8fa500b9b0fe8846d.tar.gz | |
- Fix build
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 2 | ||||
| -rw-r--r-- | ext/soap/soap.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index a8659cdd58..0e5305cd80 100644 --- 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 eba63f928b..54bddadd52 100644 --- 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 259b24c1fd..843df850c1 100644 --- 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; |