patch 8.1.1237: error for using "compl", reserved word in C++
Problem: Error for using "compl", reserved word in C++.
Solution: Rename to "complp". (suggestion by Ken Takata)
diff --git a/src/usercmd.c b/src/usercmd.c
index 737b2fe..db1a77b 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -131,7 +131,7 @@
char_u *p, // end of the command (possibly including count)
int *full, // set to TRUE for a full match
expand_T *xp, // used for completion, NULL otherwise
- int *compl UNUSED) // completion flags or NULL
+ int *complp UNUSED) // completion flags or NULL
{
int len = (int)(p - eap->cmd);
int j, k, matchlen = 0;
@@ -188,8 +188,8 @@
eap->addr_type = uc->uc_addr_type;
# ifdef FEAT_CMDL_COMPL
- if (compl != NULL)
- *compl = uc->uc_compl;
+ if (complp != NULL)
+ *complp = uc->uc_compl;
# ifdef FEAT_EVAL
if (xp != NULL)
{
@@ -692,7 +692,7 @@
long *argt,
long *def,
int *flags,
- int *compl,
+ int *complp,
char_u **compl_arg,
int *addr_type_arg)
{
@@ -810,7 +810,7 @@
return FAIL;
}
- if (parse_compl_arg(val, (int)vallen, compl, argt, compl_arg)
+ if (parse_compl_arg(val, (int)vallen, complp, argt, compl_arg)
== FAIL)
return FAIL;
}