summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2004-01-17 00:26:12 +0000
committerfoobar <sniper@php.net>2004-01-17 00:26:12 +0000
commit796938ec7f9bdffe8c52867fb4b7a04d068de8de (patch)
treef87185195bd5767aa2e08ee10469f52dc37a4e3e
parent2c71464b40cb7beaa908b495e2e7ff9f5c631cc8 (diff)
downloadphp-git-796938ec7f9bdffe8c52867fb4b7a04d068de8de.tar.gz
Nuke compile warning by using the LANG_SCNG macro instead
-rw-r--r--Zend/zend_compile.c2
-rw-r--r--Zend/zend_language_scanner.h1
-rw-r--r--Zend/zend_language_scanner.l5
3 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 9432407abd..364df789c0 100644
--- 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 36a2f6700f..ab8bc3d531 100644
--- 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 a714b34fad..8f9a966d00 100644
--- 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;