From 7b12ac3ad86f02bf26d6830caa991041dd1c4785 Mon Sep 17 00:00:00 2001 From: Zoltan Arpadffy Date: Sun, 29 Dec 2024 09:50:20 +0100 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- src/structs.h | 2 +- src/version.c | 2 ++ src/vim9execute.c | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/structs.h b/src/structs.h index d6d4a0fef7..c036bf15a9 100644 --- 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 0bbe089190..8e884afbf6 100644 --- 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 de49aaa70c..de12d8e6a6 100644 --- 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);