cvs: ZendEngine2 / zend_compile.c zend_language_scanner.h zend_language_scanner.l

wez Sun Jan 11 16:39:41 2004 EDT Modified files: /ZendEngine2 zend_compile.c zend_language_scanner.h zend_language_scanner.l Log: TSRMLS fix Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.511 ZendEngine2/zend_compile.c:1.512 --- ZendEngine2/zend_compile.c:1.511 Sun Jan 11 14:27:13 2004 +++ ZendEngine2/zend_compile.c Sun Jan 11 16:39:40 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.511 2004/01/11 19:27:13 andi Exp $ */ +/* $Id: zend_compile.c,v 1.512 2004/01/11 21:39:40 wez Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -68,7 +68,7 @@ uint char_pos_len; char *filename; - char_pos_len = zend_sprintf(char_pos_buf, "%x", zend_get_last_accepting_character_position()); + char_pos_len = zend_sprintf(char_pos_buf, "%x", zend_get_last_accepting_character_position(TSRMLS_C)); if (CG(active_op_array)->filename) { filename = CG(active_op_array)->filename; } else { Index: ZendEngine2/zend_language_scanner.h diff -u ZendEngine2/zend_language_scanner.h:1.16 ZendEngine2/zend_language_scanner.h:1.17 --- ZendEngine2/zend_language_scanner.h:1.16 Sun Jan 11 14:27:13 2004 +++ ZendEngine2/zend_language_scanner.h Sun Jan 11 16:39:40 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.h,v 1.16 2004/01/11 19:27:13 andi Exp $ */ +/* $Id: zend_language_scanner.h,v 1.17 2004/01/11 21:39:40 wez Exp $ */ #ifndef ZEND_SCANNER_H #define ZEND_SCANNER_H @@ -53,7 +53,7 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC); ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC); ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_DC); -char *zend_get_last_accepting_character_position(); +char *zend_get_last_accepting_character_position(TSRMLS_D); END_EXTERN_C() Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.100 ZendEngine2/zend_language_scanner.l:1.101 --- ZendEngine2/zend_language_scanner.l:1.100 Sun Jan 11 14:27:13 2004 +++ ZendEngine2/zend_language_scanner.l Sun Jan 11 16:39:40 2004 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.100 2004/01/11 19:27:13 andi Exp $ */ +/* $Id: zend_language_scanner.l,v 1.101 2004/01/11 21:39:40 wez Exp $ */ #define yyleng SCNG(yy_leng) #define yytext SCNG(yy_text) @@ -178,7 +178,7 @@ #endif /* ZEND_MULTIBYTE */ } -char *zend_get_last_accepting_character_position() +char *zend_get_last_accepting_character_position(TSRMLS_D) { return SCNG(_yy_last_accepting_cpos); }