From c9f4568ea6633defc45c40237a7ebdb1090d4ecf Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 26 May 2011 16:23:03 +0300 Subject: [PATCH] Fix Microsoft Visual Studio incompatibility in plugin.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit MS Visual Studio don't like to have struct members named in the variable declaration. Without this fix, Visual Studio is not able to compile the new v3 plug-in API. Signed-off-by: David Sommerseth Tested-by: Samuli Seppänen Signed-off-by: Samuli Seppänen Acked-by: Gert Doering --- plugin.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugin.c b/plugin.c index 56bd37ff6..745ea514d 100644 --- a/plugin.c +++ b/plugin.c @@ -299,9 +299,9 @@ plugin_open_item (struct plugin *p, * Call the plugin initialization */ if (p->open3) { - struct openvpn_plugin_args_open_in args = { .type_mask = p->plugin_type_mask, - .argv = o->argv, - .envp = envp }; + struct openvpn_plugin_args_open_in args = { p->plugin_type_mask, + (const char ** const) o->argv, + (const char ** const) envp }; struct openvpn_plugin_args_open_return retargs; CLEAR(retargs); @@ -367,13 +367,13 @@ plugin_call_item (const struct plugin *p, * Call the plugin work function */ if (p->func3) { - struct openvpn_plugin_args_func_in args = { .type = type, - .argv = (const char **) a.argv, - .envp = envp, - .handle = p->plugin_handle, - .per_client_context = per_client_context, - .current_cert_depth = (current_cert ? certdepth : -1), - .current_cert = current_cert }; + struct openvpn_plugin_args_func_in args = { type, + (const char ** const) a.argv, + (const char ** const) envp, + p->plugin_handle, + per_client_context, + (current_cert ? certdepth : -1), + current_cert }; struct openvpn_plugin_args_func_return retargs; CLEAR(retargs); -- 2.47.2