commit 864f631d2886e9842473b61cd78bc924c5541efa
author Vincent Béron <vberon@mecano.gme.usherb.ca> Fri Dec 02 13:29:52 2005 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 02 13:29:52 2005 +0100
tree 1fe1fcdb093d37da46367682192e543aa1941592
parent 85e9474c78aff8933fb476968b9172549808a3ba

Reorder the virtual table definition so it's defined before it is used
in widl header output.

tools/widl/header.c

diff --git a/tools/widl/header.c b/tools/widl/header.c
index 80d8809..90b93ca 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -827,17 +827,16 @@
   }
   fprintf(header, "#else\n");
   /* C interface */
-  fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
-  fprintf(header, "interface %s {\n", iface->name);
-  fprintf(header, "    const %sVtbl* lpVtbl;\n", iface->name);
-  fprintf(header, "};\n");
-  fprintf(header, "struct %sVtbl {\n", iface->name);
+  fprintf(header, "typedef struct %sVtbl {\n", iface->name);
   indentation++;
   fprintf(header, "    BEGIN_INTERFACE\n");
   fprintf(header, "\n");
   write_c_method_def(iface);
   indentation--;
   fprintf(header, "    END_INTERFACE\n");
+  fprintf(header, "} %sVtbl;\n", iface->name);
+  fprintf(header, "interface %s {\n", iface->name);
+  fprintf(header, "    const %sVtbl* lpVtbl;\n", iface->name);
   fprintf(header, "};\n");
   fprintf(header, "\n");
   fprintf(header, "#ifdef COBJMACROS\n");
@@ -894,17 +893,16 @@
   fprintf(header, "};\n");
   fprintf(header, "#else\n");
   /* C interface */
-  fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
-  fprintf(header, "interface %s {\n", iface->name);
-  fprintf(header, "    const %sVtbl* lpVtbl;\n", iface->name);
-  fprintf(header, "};\n");
-  fprintf(header, "struct %sVtbl {\n", iface->name);
+  fprintf(header, "typedef struct %sVtbl {\n", iface->name);
   indentation++;
   fprintf(header, "    BEGIN_INTERFACE\n");
   fprintf(header, "\n");
   write_c_disp_method_def(iface);
   indentation--;
   fprintf(header, "    END_INTERFACE\n");
+  fprintf(header, "} %sVtbl;\n", iface->name);
+  fprintf(header, "interface %s {\n", iface->name);
+  fprintf(header, "    const %sVtbl* lpVtbl;\n", iface->name);
   fprintf(header, "};\n");
   fprintf(header, "\n");
   fprintf(header, "#ifdef COBJMACROS\n");