patch 9.1.0970: VMS: build errors on VMS architecture

Problem:  VMS: build errors on VMS architecture
Solution: define cellsize struct, use C89 to initialize lval_root_S
          struct (Zoltan Arpadffy)

* define struct cellsize for VMS
* ensures the code adheres to the C89 standard

closes: #16328

Signed-off-by: Zoltan Arpadffy <zoltan.arpadffy@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/structs.h b/src/structs.h
index d6d4a0fef715a4b2c8813e1fb5c308a89bab91e0..c036bf15a9c4b4926fd23dab53e831f3ab9ee817 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -5101,7 +5101,7 @@ typedef struct
 #define KEYVALUE_ENTRY(k, v) \
     {(k), {((char_u *)v), STRLEN_LITERAL(v)}}
 
-#if defined(UNIX) || defined(MSWIN)
+#if defined(UNIX) || defined(MSWIN) || defined(VMS)
 // Defined as signed, to return -1 on error
 struct cellsize {
     int cs_xpixel;

diff --git a/src/version.c b/src/version.c
index 0bbe089190f58f80b84b958b30f5190e99592e3e..8e884afbf6e79f60b9e617a2b37d91b78fdfb48a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    970,
 /**/
     969,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index de49aaa70c7994cbe86961c7711e929e09de7e3d..de12d8e6a6caa5e61451254a942fc43103c596c3 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -4425,9 +4425,10 @@ exec_instructions(ectx_T *ectx)
                    // Stack has the local variable, argument the whole :lock
                    // or :unlock command, like ISN_EXEC.
                    --ectx->ec_stack.ga_len;
-                   lval_root_T root = { .lr_tv = STACK_TV_BOT(0),
-                           .lr_cl_exec = iptr->isn_arg.lockunlock.lu_cl_exec,
-                           .lr_is_arg  = iptr->isn_arg.lockunlock.lu_is_arg };
+                   lval_root_T root;
+                   root.lr_tv      = STACK_TV_BOT(0);
+                   root.lr_cl_exec = iptr->isn_arg.lockunlock.lu_cl_exec;
+                   root.lr_is_arg  = iptr->isn_arg.lockunlock.lu_is_arg;
                    lval_root = &root;
                    int res = exec_command(iptr,
                                        iptr->isn_arg.lockunlock.lu_string);