widl: Fix detection of varying arrays.

Correctly identify structures containing varying arrays as conformant
varying structures.
This commit is contained in:
Robert Shearman 2006-01-24 11:14:38 +01:00 committed by Alexandre Julliard
parent b4fb36c363
commit 2eedb11f22

View File

@ -1258,13 +1258,17 @@ static int get_struct_type(var_t *field)
continue;
}
if (is_array_type(field->attrs, field->ptr_level, field->array) &&
field->array && !field->array->is_const)
if (is_array_type(field->attrs, field->ptr_level, field->array))
{
has_conformance = 1;
if (PREV_LINK(field))
yyerror("field %s deriving from a conformant array must be the last field in the structure\n",
field->name);
if (field->array && !field->array->is_const)
{
has_conformance = 1;
if (PREV_LINK(field))
yyerror("field %s deriving from a conformant array must be the last field in the structure\n",
field->name);
}
if (is_attr(field->attrs, ATTR_LENGTHIS))
has_variance = 1;
continue;
}