--- embedaddon/php/Zend/zend_language_scanner.h	2012/02/21 23:47:52	1.1.1.1
+++ embedaddon/php/Zend/zend_language_scanner.h	2012/05/29 12:34:36	1.1.1.2
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.h,v 1.1.1.1 2012/02/21 23:47:52 misho Exp $ */
+/* $Id: zend_language_scanner.h,v 1.1.1.2 2012/05/29 12:34:36 misho Exp $ */
 
 #ifndef ZEND_SCANNER_H
 #define ZEND_SCANNER_H
@@ -36,7 +36,6 @@ typedef struct _zend_lex_state {
 	uint lineno;
 	char *filename;
 
-#ifdef ZEND_MULTIBYTE
 	/* original (unfiltered) script */
 	unsigned char *script_org;
 	size_t script_org_size;
@@ -48,9 +47,7 @@ typedef struct _zend_lex_state {
 	/* input/ouput filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
-	zend_encoding *script_encoding;
-	zend_encoding *internal_encoding;
-#endif /* ZEND_MULTIBYTE */
+	const zend_encoding *script_encoding;
 } zend_lex_state;
 
 
@@ -59,6 +56,8 @@ int zend_compare_file_handles(zend_file_handle *fh1, z
 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);
+ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter, const zend_encoding *old_encoding TSRMLS_DC);
+ZEND_API int zend_multibyte_set_filter(const zend_encoding *onetime_encoding TSRMLS_DC);
 
 END_EXTERN_C()