Module: wine Branch: master Commit: c7a2aaf2343b218729eb640f0990512f01383b53 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7a2aaf2343b218729eb640f0990512...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 8 10:11:17 2023 +0100
widl: Remove DECLSPEC_HIDDEN from generated files.
---
tools/widl/client.c | 8 ++------ tools/widl/proxy.c | 6 +----- tools/widl/server.c | 8 ++------ 3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/tools/widl/client.c b/tools/widl/client.c index 704be91cb78..d28b605bc58 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -468,10 +468,10 @@ static void write_clientinterfacedecl(type_t *iface) indent--; print_client("};\n"); if (old_names) - print_client("RPC_IF_HANDLE %s_ClientIfHandle DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", iface->name, iface->name); else - print_client("RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + print_client("RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", prefix_client, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(client, "\n"); } @@ -500,10 +500,6 @@ static void init_client(void) print_client( "\n"); print_client("#include "%s"\n", header_name); print_client( "\n"); - print_client( "#ifndef DECLSPEC_HIDDEN\n"); - print_client( "#define DECLSPEC_HIDDEN\n"); - print_client( "#endif\n"); - print_client( "\n"); }
diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3d55cd73ee7..8fed948d8de 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -86,10 +86,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#define __midl_proxy\n"); print_proxy( "#include "objbase.h"\n"); print_proxy( "\n"); - print_proxy( "#ifndef DECLSPEC_HIDDEN\n"); - print_proxy( "#define DECLSPEC_HIDDEN\n"); - print_proxy( "#endif\n"); - print_proxy( "\n"); }
static void clear_output_vars( const var_list_t *args ) @@ -1026,7 +1022,7 @@ static void write_proxy_routines(const statement_list_t *stmts) fprintf(proxy, "\n"); }
- fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo DECLSPEC_HIDDEN =\n", file_id); + fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo =\n", file_id); fprintf(proxy, "{\n"); fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); fprintf(proxy, " (const PCInterfaceStubVtblList*)_%s_StubVtblList,\n", file_id); diff --git a/tools/widl/server.c b/tools/widl/server.c index 1d8ab41185d..c7ecb656bfb 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -433,10 +433,10 @@ static void write_serverinterfacedecl(type_t *iface) indent--; print_server("};\n"); if (old_names) - print_server("RPC_IF_HANDLE %s_ServerIfHandle DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", iface->name, iface->name); else - print_server("RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + print_server("RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", prefix_server, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(server, "\n"); } @@ -453,10 +453,6 @@ static void init_server(void) print_server("#include <string.h>\n"); fprintf(server, "\n"); print_server("#include "%s"\n", header_name); - print_server("\n"); - print_server( "#ifndef DECLSPEC_HIDDEN\n"); - print_server( "#define DECLSPEC_HIDDEN\n"); - print_server( "#endif\n"); print_server( "\n"); }
-
Alexandre Julliard