Be more explicit.

diff --git a/Zend/zend.h b/Zend/zend.h
index 87fd9d839e39bea95b06c529ff3e1854863a479a..64d020512ac9eb1056df74931098c91b04b8c7e1 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -471,6 +471,9 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length);
 #define OE_IS_OBJECT   (1<<1)
 #define OE_IS_METHOD   (1<<2)
 
+/* default engine string type */
+#define ZEND_STR_TYPE (UG(unicode)?IS_UNICODE:IS_STRING)
+
 int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
 void zend_shutdown(TSRMLS_D);
 void zend_register_standard_ini_entries(TSRMLS_D);

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index ed32c9663cf84e7adcd21be3f687e922194098c1..adebc96ba00a3994a33c26f92486c5a5d4fe5105 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -428,7 +428,7 @@ ZEND_API int zend_copy_scanner_string(zval *zendlval, char *str, zend_uint str_l
        } else {
                Z_STRVAL_P(zendlval) = (char *)estrndup(str, str_len);
                Z_STRLEN_P(zendlval) = str_len;
-               Z_TYPE_P(zendlval) = type;
+               Z_TYPE_P(zendlval) = IS_STRING;
        }
 
        return 1;