widl: Fix redefinition of types in output.

This commit is contained in:
Dan Hipschman 2006-07-24 14:39:38 -07:00 committed by Alexandre Julliard
parent f06f3cf470
commit f3d01fb07b

View File

@ -248,7 +248,7 @@ void write_type(FILE *h, type_t *t, const var_t *v, const char *n)
break; break;
case RPC_FC_ENUM16: case RPC_FC_ENUM16:
case RPC_FC_ENUM32: case RPC_FC_ENUM32:
if (t->defined && !t->written) { if (t->defined && !t->written && !t->ignore) {
if (t->name) fprintf(h, "enum %s {\n", t->name); if (t->name) fprintf(h, "enum %s {\n", t->name);
else fprintf(h, "enum {\n"); else fprintf(h, "enum {\n");
t->written = TRUE; t->written = TRUE;
@ -274,7 +274,7 @@ void write_type(FILE *h, type_t *t, const var_t *v, const char *n)
case RPC_FC_PSTRUCT: case RPC_FC_PSTRUCT:
case RPC_FC_BOGUS_STRUCT: case RPC_FC_BOGUS_STRUCT:
case RPC_FC_ENCAPSULATED_UNION: case RPC_FC_ENCAPSULATED_UNION:
if (t->defined && !t->written) { if (t->defined && !t->written && !t->ignore) {
if (t->name) fprintf(h, "struct %s {\n", t->name); if (t->name) fprintf(h, "struct %s {\n", t->name);
else fprintf(h, "struct {\n"); else fprintf(h, "struct {\n");
t->written = TRUE; t->written = TRUE;
@ -286,7 +286,7 @@ void write_type(FILE *h, type_t *t, const var_t *v, const char *n)
else fprintf(h, "struct %s", t->name); else fprintf(h, "struct %s", t->name);
break; break;
case RPC_FC_NON_ENCAPSULATED_UNION: case RPC_FC_NON_ENCAPSULATED_UNION:
if (t->defined && !t->written) { if (t->defined && !t->written && !t->ignore) {
if (t->name) fprintf(h, "union %s {\n", t->name); if (t->name) fprintf(h, "union %s {\n", t->name);
else fprintf(h, "union {\n"); else fprintf(h, "union {\n");
t->written = TRUE; t->written = TRUE;