Alexandre Julliard : widl: Fix declaration order in generated headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d3c4106d6f6d587ec4b9013692dc1cf6da29c279
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d3c4106d6f6d587ec4b9013692...

Author: Alexandre Julliard 
Date:   Mon Sep  6 17:06:59 2010 +0200

widl: Fix declaration order in generated headers.

---

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

diff --git a/tools/widl/header.c b/tools/widl/header.c
index b9b750a..eaef867 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -1309,16 +1309,14 @@ void write_header(const statement_list_t *stmts)

fprintf(header, "#ifndef __WIDL_%s\n", header_token);
   fprintf(header, "#define __WIDL_%s\n\n", header_token);
-  start_cplusplus_guard(header);
-
-  fprintf(header, "/* Headers for imported files */\n\n");
-  write_imports(header, stmts);
-  fprintf(header, "\n");

-  /* FIXME: should be before imported file includes */
   fprintf(header, "/* Forward declarations */\n\n");
   write_forward_decls(header, stmts);
+
+  fprintf(header, "/* Headers for imported files */\n\n");
+  write_imports(header, stmts);
   fprintf(header, "\n");
+  start_cplusplus_guard(header);

write_header_stmts(header, stmts, NULL, FALSE);