]> granicus.if.org Git - vim/commitdiff
patch 8.2.0057: cannot build with small features v8.2.0057
authorBram Moolenaar <Bram@vim.org>
Sun, 29 Dec 2019 22:53:01 +0000 (23:53 +0100)
committerBram Moolenaar <Bram@vim.org>
Sun, 29 Dec 2019 22:53:01 +0000 (23:53 +0100)
Problem:    Cannot build with small features.
Solution:   Add #ifdefs.

src/scriptfile.c
src/version.c

index d471839f079553671a62c25811c80634292bf599..dccf7355952a54ee9e06863e377b971c908227f5 100644 (file)
@@ -32,7 +32,9 @@ estack_init(void)
     entry->es_type = ETYPE_TOP;
     entry->es_name = NULL;
     entry->es_lnum = 0;
+#ifdef FEAT_EVAL
     entry->es_info.ufunc = NULL;
+#endif
     ++exestack.ga_len;
 }
 
@@ -53,13 +55,16 @@ estack_push(etype_T type, char_u *name, long lnum)
        entry->es_type = type;
        entry->es_name = name;
        entry->es_lnum = lnum;
+#ifdef FEAT_EVAL
        entry->es_info.ufunc = NULL;
+#endif
        ++exestack.ga_len;
        return entry;
     }
     return NULL;
 }
 
+#if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Add a user function to the execution stack.
  */
@@ -72,6 +77,7 @@ estack_push_ufunc(etype_T type, ufunc_T *ufunc, long lnum)
     if (entry != NULL)
        entry->es_info.ufunc = ufunc;
 }
+#endif
 
 /*
  * Take an item off of the execution stack.
@@ -98,9 +104,12 @@ estack_sfile(void)
     entry = ((estack_T *)exestack.ga_data) + exestack.ga_len - 1;
     if (entry->es_name == NULL)
        return NULL;
+#ifdef FEAT_EVAL
     if (entry->es_info.ufunc == NULL)
+#endif
        return vim_strsave(entry->es_name);
 
+#ifdef FEAT_EVAL
     // For a function we compose the call stack, as it was done in the past:
     //   "function One[123]..Two[456]..Three"
     len = STRLEN(entry->es_name) + 10;
@@ -132,6 +141,7 @@ estack_sfile(void)
        vim_snprintf(res + done, len - done, "%s", entry->es_name);
     }
     return (char_u *)res;
+#endif
 }
 
 /*
index 984ac7bcf6a83a8e2503456fbbe0fc8ce5a3cae8..885e6bfc8689bf7f47b8b9b07f1e0cea1567626f 100644 (file)
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    57,
 /**/
     56,
 /**/