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 b90ecdfe51425cc9fc6487ca9af9fbb9c5d1643f..bf66c667a6da1c40c248b4a2d98bab148e0d942b 100644 (file)
--- 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;