- Replace do_exit() with zend_do_exit().

- Problem reported by David Hedbor <david@hedbor.org>

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8c39273e989e0f95f9e698741a2cdf3cf41957ab..1b4f3c3147322d096d8d959fc2dde696438de7d7 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2170,7 +2170,7 @@ void do_end_heredoc(CLS_D)
 }
 
 
-void do_exit(znode *result, znode *message CLS_DC)
+void zend_do_exit(znode *result, znode *message CLS_DC)
 {
        zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index dee9c12b9eca8bbac4f0325761c9b32e1d47c5cf..98e21f81579d5bc251c36ba9c99ee90e038a9770 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -354,7 +354,7 @@ void do_declare_end(CLS_D);
 
 void do_end_heredoc(CLS_D);
 
-void do_exit(znode *result, znode *message CLS_DC);
+void zend_do_exit(znode *result, znode *message CLS_DC);
 
 void do_begin_silence(znode *strudel_token CLS_DC);
 void do_end_silence(znode *strudel_token CLS_DC);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 0917f7d5555583b0a0466b4b4198c26b2fbbdaee..c5b3eb712d01f635da81ffb9e51a4c455d9c764d 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -476,7 +476,7 @@ expr_without_variable:
        |       T_OBJECT_CAST expr      { do_cast(&$$, &$2, IS_OBJECT CLS_CC); }
        |       T_BOOL_CAST expr        { do_cast(&$$, &$2, IS_BOOL CLS_CC); }
        |       T_UNSET_CAST expr       { do_cast(&$$, &$2, IS_NULL CLS_CC); }
-       |       T_EXIT exit_expr        { do_exit(&$$, &$2 CLS_CC); }
+       |       T_EXIT exit_expr        { zend_do_exit(&$$, &$2 CLS_CC); }
        |       '@' { do_begin_silence(&$1 CLS_CC); } expr { do_end_silence(&$1 CLS_CC); $$ = $3; }
        |       scalar                          { $$ = $1; }
        |       T_ARRAY '(' array_pair_list ')' { $$ = $3; }