Dan Hipschman : widl: Fix redefinition of types in output.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jul 25 05:09:45 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: f3d01fb07b38858c28156eb1ec1799765f65fd20
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f3d01fb07b38858c28156eb1ec1799765f65fd20

Author: Dan Hipschman <dsh at linux.ucla.edu>
Date:   Mon Jul 24 14:39:38 2006 -0700

widl: Fix redefinition of types in output.

---

 tools/widl/header.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/widl/header.c b/tools/widl/header.c
index 2de2ca7..4cd599b 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -248,7 +248,7 @@ void write_type(FILE *h, type_t *t, cons
         break;
       case RPC_FC_ENUM16:
       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);
           else fprintf(h, "enum {\n");
           t->written = TRUE;
@@ -274,7 +274,7 @@ void write_type(FILE *h, type_t *t, cons
       case RPC_FC_PSTRUCT:
       case RPC_FC_BOGUS_STRUCT:
       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);
           else fprintf(h, "struct {\n");
           t->written = TRUE;
@@ -286,7 +286,7 @@ void write_type(FILE *h, type_t *t, cons
         else fprintf(h, "struct %s", t->name);
         break;
       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);
           else fprintf(h, "union {\n");
           t->written = TRUE;




More information about the wine-cvs mailing list