[Openvpn-devel] [PATCH 2/4] Fix Microsoft Visual Studio incompatibility in plugin.c

[Samuli S. <sa...@op...>]

From: David Sommerseth <da...@re...>

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 <da...@re...>
Tested-by: Samuli Seppänen <sa...@op...>
Signed-off-by: Samuli Seppänen <sa...@op...>
---
 plugin.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin.c b/plugin.c
index 56bd37f..745ea51 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);
-- 
1.6.3.3