aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/runtime.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-04-13 06:39:30 +0800
committerGitHub <noreply@github.com>2024-04-13 06:39:30 +0800
commit4f3d018d15d299b66a341bed4d677d7ec03ad44f (patch)
treee79ecb738cb33e606495e141054c184a8e1caf6a /src/nvim/runtime.c
parent64aa0f7d0b7034a5158401cf6b987cb82cc60031 (diff)
downloadrneovim-4f3d018d15d299b66a341bed4d677d7ec03ad44f.tar.gz
rneovim-4f3d018d15d299b66a341bed4d677d7ec03ad44f.tar.bz2
rneovim-4f3d018d15d299b66a341bed4d677d7ec03ad44f.zip
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 <zoltan.arpadffy@gmail.com>
Diffstat (limited to 'src/nvim/runtime.c')
-rw-r--r--src/nvim/runtime.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index bc9ace0fa8..dd9f9370f3 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -2733,7 +2733,7 @@ void ex_scriptencoding(exarg_T *eap)
struct source_cookie *sp;
char *name;
- if (!getline_equal(eap->getline, eap->cookie, getsourceline)) {
+ if (!getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
emsg(_("E167: :scriptencoding used outside of a sourced file"));
return;
}
@@ -2745,7 +2745,7 @@ void ex_scriptencoding(exarg_T *eap)
}
// Setup for conversion from the specified encoding to 'encoding'.
- sp = (struct source_cookie *)getline_cookie(eap->getline, eap->cookie);
+ sp = (struct source_cookie *)getline_cookie(eap->ea_getline, eap->cookie);
convert_setup(&sp->conv, name, p_enc);
if (name != eap->arg) {
@@ -2756,7 +2756,7 @@ void ex_scriptencoding(exarg_T *eap)
/// ":finish": Mark a sourced file as finished.
void ex_finish(exarg_T *eap)
{
- if (getline_equal(eap->getline, eap->cookie, getsourceline)) {
+ if (getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
do_finish(eap, false);
} else {
emsg(_("E168: :finish used outside of a sourced file"));
@@ -2769,7 +2769,7 @@ void ex_finish(exarg_T *eap)
void do_finish(exarg_T *eap, bool reanimate)
{
if (reanimate) {
- ((struct source_cookie *)getline_cookie(eap->getline,
+ ((struct source_cookie *)getline_cookie(eap->ea_getline,
eap->cookie))->finished = false;
}
@@ -2782,7 +2782,7 @@ void do_finish(exarg_T *eap, bool reanimate)
eap->cstack->cs_pending[idx] = CSTP_FINISH;
report_make_pending(CSTP_FINISH, NULL);
} else {
- ((struct source_cookie *)getline_cookie(eap->getline,
+ ((struct source_cookie *)getline_cookie(eap->ea_getline,
eap->cookie))->finished = true;
}
}