cvs: php-src(PHP_5_2) /ext/session session.c /main main.c

tony2001 Mon Dec 4 15:58:48 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/session session.c /php-src/main main.c Log: MFH: fix retval type http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.19&r2=1.417.2.8.2.20&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.19 php-src/ext/session/session.c:1.417.2.8.2.20 --- php-src/ext/session/session.c:1.417.2.8.2.19 Mon Dec 4 15:19:26 2006 +++ php-src/ext/session/session.c Mon Dec 4 15:58:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.19 2006/12/04 15:19:26 iliaa Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.20 2006/12/04 15:58:48 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -276,7 +276,7 @@ static void php_rinit_session_globals(TSRMLS_D); static void php_rshutdown_session_globals(TSRMLS_D); -static zend_bool php_session_destroy(TSRMLS_D); +static int php_session_destroy(TSRMLS_D); zend_module_entry session_module_entry = { STANDARD_MODULE_HEADER, @@ -1304,9 +1304,9 @@ } } -static zend_bool php_session_destroy(TSRMLS_D) +static int php_session_destroy(TSRMLS_D) { - zend_bool retval = SUCCESS; + int retval = SUCCESS; if (PS(session_status) != php_session_active) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to destroy uninitialized session"); http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.19&r2=1.640.2.23.2.20&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.19 php-src/main/main.c:1.640.2.23.2.20 --- php-src/main/main.c:1.640.2.23.2.19 Thu Nov 23 08:37:21 2006 +++ php-src/main/main.c Mon Dec 4 15:58:48 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.19 2006/11/23 08:37:21 dmitry Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.20 2006/12/04 15:58:48 tony2001 Exp $ */ /* {{{ includes */ @@ -1893,7 +1893,7 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC) { zend_op_array *op_array; - zend_bool retval = FAILURE; + int retval = FAILURE; zend_try { op_array = zend_compile_file(file, ZEND_INCLUDE TSRMLS_CC);