cvs: ZendEngine2 / zend_compile.h zend_language_scanner.l

moriyoshi Mon Jul 28 06:07:19 2008 UTC Modified files: /ZendEngine2 zend_language_scanner.l zend_compile.h Log: - Sync function signature with the 5.3 branch http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.189&r2=1.190&diff_format=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.189 ZendEngine2/zend_language_scanner.l:1.190 --- ZendEngine2/zend_language_scanner.l:1.189 Sat Jul 26 15:31:38 2008 +++ ZendEngine2/zend_language_scanner.l Mon Jul 28 06:07:19 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.189 2008/07/26 15:31:38 dmitry Exp $ */ +/* $Id: zend_language_scanner.l,v 1.190 2008/07/28 06:07:19 moriyoshi Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -858,7 +858,7 @@ } -ZEND_API int zend_get_scanned_file_offset(TSRMLS_D) +ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D) { return SCNG(yy_cursor) - SCNG(yy_start); } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.h?r1=1.386&r2=1.387&diff_format=u Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.386 ZendEngine2/zend_compile.h:1.387 --- ZendEngine2/zend_compile.h:1.386 Sat Jul 26 15:31:38 2008 +++ ZendEngine2/zend_compile.h Mon Jul 28 06:07:19 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.386 2008/07/26 15:31:38 dmitry Exp $ */ +/* $Id: zend_compile.h,v 1.387 2008/07/28 06:07:19 moriyoshi Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -359,7 +359,7 @@ ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename TSRMLS_DC); ZEND_API char *zend_get_compiled_filename(TSRMLS_D); ZEND_API int zend_get_compiled_lineno(TSRMLS_D); -ZEND_API int zend_get_scanned_file_offset(TSRMLS_D); +ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D); ZEND_API char *zend_set_compiled_script_encoding(char *new_script_enc TSRMLS_DC); ZEND_API void zend_restore_compiled_script_encoding(char *original_script_enc TSRMLS_DC); ZEND_API char *zend_get_compiled_script_encoding(TSRMLS_D);