tony2001 Wed May 11 17:16:30 2005 EDT Modified files: /php-src/ext/soap soap.c Log: fix both win and gcc compile errors http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.147&r2=1.148&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.147 php-src/ext/soap/soap.c:1.148 --- php-src/ext/soap/soap.c:1.147 Wed May 11 16:04:18 2005 +++ php-src/ext/soap/soap.c Wed May 11 17:16:29 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.147 2005/05/11 20:04:18 tony2001 Exp $ */ +/* $Id: soap.c,v 1.148 2005/05/11 21:16:29 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1842,11 +1842,14 @@ static void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args) { - zend_bool _old_in_compilation = CG(in_compilation); - zend_bool _old_in_execution = EG(in_execution); - zend_execute_data *_old_current_execute_data = EG(current_execute_data); + zend_bool _old_in_compilation, _old_in_execution; + zend_execute_data *_old_current_execute_data; TSRMLS_FETCH(); + _old_in_compilation = CG(in_compilation); + _old_in_execution = EG(in_execution); + _old_current_execute_data = EG(current_execute_data); + if (!SOAP_GLOBAL(use_soap_error_handler)) { old_error_handler(error_num, error_filename, error_lineno, format, args); return;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php