From 4f3d018d15d299b66a341bed4d677d7ec03ad44f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 13 Apr 2024 06:39:30 +0800 Subject: vim-patch:9.0.2180: POSIX function name in exarg causes issues (#28308) Problem: POSIX function name in exarg struct causes issues on OpenVMS Solution: Rename getline member in exarg struct to ea_getline, remove isinf() workaround for VMS There are compilers that do not treat well POSIX functions - like getline - usage in the structs. Older VMS compilers could digest this... but the newer OpenVMS compilers ( like VSI C x86-64 X7.4-843 (GEM 50XB9) ) cannot deal with these structs. This could be limited to getline() that is defined via getdelim() and might not affect all POSIX functions in general - but avoiding POSIX function names usage in the structs is a "safe side" practice without compromising the functionality or the code readability. The previous OpenVMS X86 port used a workaround limiting the compiler capabilities using __CRTL_VER_OVERRIDE=80400000 In order to make the OpenVMS port future proof, this pull request proposes a possible solution. closes: vim/vim#13704 https://github.com/vim/vim/commit/6fdb6280821a822768df5689a5d727e37d38306c Co-authored-by: Zoltan Arpadffy --- src/nvim/digraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/digraph.c') diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index f91ff9274b..a358a1723a 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -2078,7 +2078,7 @@ void ex_loadkeymap(exarg_T *eap) char buf[KMAP_LLEN + 11]; char *save_cpo = p_cpo; - if (!getline_equal(eap->getline, eap->cookie, getsourceline)) { + if (!getline_equal(eap->ea_getline, eap->cookie, getsourceline)) { emsg(_("E105: Using :loadkeymap not in a sourced file")); return; } @@ -2094,7 +2094,7 @@ void ex_loadkeymap(exarg_T *eap) // Get each line of the sourced file, break at the end. while (true) { - char *line = eap->getline(0, eap->cookie, 0, true); + char *line = eap->ea_getline(0, eap->cookie, 0, true); if (line == NULL) { break; -- cgit