From: Sara Golemon <pollita@php.net>
Date: Sat, 7 Oct 2006 04:45:42 +0000 (+0000)
Subject: Win32 build gets confused by expansion of U_STRING_DECL macro with constants
X-Git-Tag: RELEASE_1_0_0RC1~1374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62f01f5e6c4ffef76387e905f0ff1d1e83273fd8;p=php

Win32 build gets confused by expansion of U_STRING_DECL macro with constants
---

diff --git a/ext/standard/type.c b/ext/standard/type.c
index b90ecdfe51..bf66c667a6 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -238,8 +238,8 @@ static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type)
 				/* We can get away with this because INCOMPLETE_CLASS is ascii and has a 1:1 relationship with unicode */
 				RETURN_TRUE;
 			} else if (UG(unicode)) {
-				U_STRING_DECL(uIncompleteClass, INCOMPLETE_CLASS, sizeof(INCOMPLETE_CLASS) - 1);
-				U_STRING_INIT(uIncompleteClass, INCOMPLETE_CLASS, sizeof(INCOMPLETE_CLASS) - 1);
+				U_STRING_DECL(uIncompleteClass, (INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
+				U_STRING_INIT(uIncompleteClass, (INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
 
 				if (!memcmp(ce->name.u, uIncompleteClass, UBYTES(sizeof(INCOMPLETE_CLASS)))) {
 					RETURN_FALSE;