widl: Make MIDL_DEFINE_GUID more compatible with midl.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Make MIDL_DEFINE_GUID more compatible with midl.
2ffd106b · Jacek Caban · Alexandre Julliard · d7bb33be · 2ffd106b
Commit 2ffd106b authored Nov 09, 2018 by Jacek Caban Committed by Alexandre Julliard Nov 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

widl.c tools/widl/widl.c +6 -1

No files found.
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -523,10 +523,15 @@ void write_id_data(const statement_list_t *stmts)
  fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n");
  fprintf(idfile, "    DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\n\n");
+  fprintf(idfile, "#elif defined(__cplusplus)\n\n");
+  fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n");
+  fprintf(idfile, "    EXTERN_C const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n");
  fprintf(idfile, "#else\n\n");
  fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n");
-  fprintf(idfile, "    const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n");
+  fprintf(idfile, "    const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n");
  fprintf(idfile, "#endif\n\n");
  start_cplusplus_guard(idfile);