Skip to content

W
wine-cw
Commit 86c565cf authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

widl: Do not generate C++ enum typedefs in WinRT mode.

MIDL generates enum typedefs without a prior type declaration, as well as using explicit enum underlying type specifier. None of this is supported in MinGW. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c89ce41e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 11 deletions
tools/widl/header.c
View file @ 86c565cf
......@@ -872,22 +872,28 @@ static void write_typedef(FILE *header, type_t *type, int declonly)
type_t *t = type_alias_get_aliasee_type(type);
if (winrt_mode && t->namespace && !is_global_namespace(t->namespace))
{
fprintf(header, "#ifdef __cplusplus\n");
write_namespace_start(header, t->namespace);
indent(header, 0);
}
fprintf(header, "typedef ");
write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT);
fprintf(header, ";\n");
if (winrt_mode && t->namespace && !is_global_namespace(t->namespace))
{
write_namespace_end(header, t->namespace);
fprintf(header, "#else /* __cplusplus */\n");
fprintf(header, "#ifndef __cplusplus\n");
fprintf(header, "typedef ");
write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->c_name, NAME_C);
fprintf(header, ";\n");
if (type_get_type_detect_alias(t) != TYPE_ENUM)
{
fprintf(header, "#else /* __cplusplus */\n");
write_namespace_start(header, t->namespace);
indent(header, 0);
fprintf(header, "typedef ");
write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT);
fprintf(header, ";\n");
write_namespace_end(header, t->namespace);
}
fprintf(header, "#endif /* __cplusplus */\n\n");
}
else
{
fprintf(header, "typedef ");
write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT);
fprintf(header, ";\n");
}
}
int is_const_decl(const var_t *var)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment