From: Bram Moolenaar Date: Sat, 3 Aug 2019 16:28:17 +0000 (+0200) Subject: patch 8.1.1801: cannot build without the +eval feature X-Git-Tag: v8.1.1801 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=505e43a20eb25674b18d73971fe3b51dad917f9a;p=vim patch 8.1.1801: cannot build without the +eval feature Problem: Cannot build without the +eval feature. Solution: Always define funcexe_T. --- diff --git a/src/structs.h b/src/structs.h index e3f6a73fe..73cacef20 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1517,22 +1517,6 @@ struct funccall_S // "func" }; -// Struct passed between functions dealing with function call execution. -// -// "argv_func", when not NULL, can be used to fill in arguments only when the -// invoked function uses them. It is called like this: -// new_argcount = argv_func(current_argcount, argv, called_func_argcount) -// -typedef struct { - int (* argv_func)(int, typval_T *, int); - linenr_T firstline; // first line of range - linenr_T lastline; // last line of range - int *doesrange; // if not NULL: return: function handled range - int evaluate; // actually evaluate expressions - partial_T *partial; // for extra arguments - dict_T *selfdict; // Dictionary for "self" -} funcexe_T; - /* * Struct used by trans_function_name() */ @@ -1621,6 +1605,22 @@ typedef struct } scriptitem_T; #endif +// Struct passed between functions dealing with function call execution. +// +// "argv_func", when not NULL, can be used to fill in arguments only when the +// invoked function uses them. It is called like this: +// new_argcount = argv_func(current_argcount, argv, called_func_argcount) +// +typedef struct { + int (* argv_func)(int, typval_T *, int); + linenr_T firstline; // first line of range + linenr_T lastline; // last line of range + int *doesrange; // if not NULL: return: function handled range + int evaluate; // actually evaluate expressions + partial_T *partial; // for extra arguments + dict_T *selfdict; // Dictionary for "self" +} funcexe_T; + struct partial_S { int pt_refcount; // reference count diff --git a/src/version.c b/src/version.c index 92d8482e8..f76921104 100644 --- a/src/version.c +++ b/src/version.c @@ -773,6 +773,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1801, /**/ 1800, /**/