Nuke compile warning by using the LANG_SCNG macro instead

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 9432407abd77e6dbbe1d8822dbe91bc508cff32b..364df789c0bf33322e7ea8a1546423e53eabc68a 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -68,7 +68,7 @@ static void build_runtime_defined_function_key(zval *result, char *name, int nam
        uint char_pos_len;
        char *filename;
 
-       char_pos_len = zend_sprintf(char_pos_buf, "%x", zend_get_last_accepting_character_position(TSRMLS_C));
+       char_pos_len = zend_sprintf(char_pos_buf, "%x", (unsigned int) LANG_SCNG(_yy_last_accepting_cpos));
        if (CG(active_op_array)->filename) {
                filename = CG(active_op_array)->filename;
        } else {

diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index 36a2f6700f98f2a8d81dfec59b2f4d4bbb26943f..ab8bc3d5310d3416189d82d29900e6f3b8aa3d55 100644 (file)
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -53,7 +53,6 @@ int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *fh2);
 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(TSRMLS_D);
 
 END_EXTERN_C()
 

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index a714b34fad89a6a32795071f03759cac861471a4..8f9a966d00416e78f1958e381f5a17c2d4c56f53 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -178,11 +178,6 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
 #endif /* ZEND_MULTIBYTE */
 }
 
-char *zend_get_last_accepting_character_position(TSRMLS_D)
-{
-       return SCNG(_yy_last_accepting_cpos);
-}
-
 ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
 {
        YY_BUFFER_STATE original_buffer_state = YY_CURRENT_BUFFER;