widl: Support multiple RPC interfaces per binary.

tools/widl/client.c

@@ -332,7 +332,7 @@ static void write_bindinghandledecl(type_t *iface)
 
 static void write_stubdescdecl(type_t *iface)
 {
-    print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name);
+    print_client("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name);
     fprintf(client, "\n");
 }
 
@@ -433,8 +433,8 @@ static void write_formatstringsdecl(type_t *iface)
     write_formatdesc("TYPE");
     write_formatdesc("PROC");
     fprintf(client, "\n");
-    print_client("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n");
-    print_client("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n");
+    print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n");
+    print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n");
     print_client("\n");
 }
 

tools/widl/server.c

@@ -481,7 +481,7 @@ static void write_dispatchtable(type_t *iface)
 
 static void write_stubdescdecl(type_t *iface)
 {
-    print_server("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name);
+    print_server("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name);
     fprintf(server, "\n");
 }
 
@@ -578,8 +578,8 @@ static void write_formatstringsdecl(type_t *iface)
     write_formatdesc("TYPE");
     write_formatdesc("PROC");
     fprintf(server, "\n");
-    print_server("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n");
-    print_server("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n");
+    print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n");
+    print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n");
     print_server("\n");
 }