From: Andrei Zmievski <andrei@php.net>
Date: Mon, 12 Jun 2006 17:06:39 +0000 (+0000)
Subject: Be more explicit.
X-Git-Tag: RELEASE_1_0_0RC1~2741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8eb6c59e10917e09e6f5455a02daa08976d637e4;p=php

Be more explicit.
---

diff --git a/Zend/zend.h b/Zend/zend.h
index 87fd9d839e..64d020512a 100644
--- 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 ed32c9663c..adebc96ba0 100644
--- 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;