Commit: patch 9.1.0970: VMS: build errors on VMS architecture

3 views
Skip to first unread message

Christian Brabandt

unread,
Dec 29, 2024, 4:00:16 AM12/29/24
to vim...@googlegroups.com
patch 9.1.0970: VMS: build errors on VMS architecture

Commit: https://github.com/vim/vim/commit/7b12ac3ad86f02bf26d6830caa991041dd1c4785
Author: Zoltan Arpadffy <zoltan....@gmail.com>
Date: Sun Dec 29 09:50:20 2024 +0100

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....@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/structs.h b/src/structs.h
index d6d4a0fef..c036bf15a 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 0bbe08919..8e884afbf 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 de49aaa70..de12d8e6a 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);
Reply all
Reply to author
Forward
0 new messages