tony2001 Wed May 11 17:16:45 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.110.2.35&r2=1.110.2.36&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.35 php-src/ext/soap/soap.c:1.110.2.36
--- php-src/ext/soap/soap.c:1.110.2.35 Wed May 11 16:04:39 2005
+++ php-src/ext/soap/soap.c Wed May 11 17:16:44 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.110.2.35 2005/05/11 20:04:39 tony2001 Exp $ */
+/* $Id: soap.c,v 1.110.2.36 2005/05/11 21:16:44 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
